src/state.c

Tue, 15 Nov 2011 10:12:37 +0000

author
Philip Pemberton <philpem@philpem.me.uk>
date
Tue, 15 Nov 2011 10:12:37 +0000
changeset 109
2f8afb9e5baa
parent 101
e20f02519835
child 112
a392eb8f9806
permissions
-rw-r--r--

[musashi] Fix handling of bus errors

Patch-Author: Andrew Warkentin <andreww591!gmail>
Patch-MessageID: <4EC200CE.2020304@gmail.com>

I have fixed the first page fault test failure in FreeBee (the page fault test now hangs rather than errors out, because it is trying to read from the hard drive to test DMA page faults).

There were actually two bugs (the first bug was masking the second one).

First, the ancient version of Musashi that you used is unable to properly resume from bus errors that happen in the middle of certain instructions (some instructions are fetched in stages, with the PC being advanced to each part of the instruction, so basically what happens is the CPU core attempts to read the memory location referenced by the first operand, the bus error occurs, causing the PC to jump to the exception vector, but the faulting instruction is still in the middle of being fetched, so the PC is then advanced past the beginning of the exception handler). I fixed this by delaying the jump to the bus error vector until after the faulting instruction finishes.

The second bug is simpler - you had the UDS and LDS bits in BSR0 inverted (they are supposed to be active low).

philpem@18 1 #define _STATE_C
philpem@18 2 #include <stddef.h>
philpem@18 3 #include <malloc.h>
philpem@18 4 #include <stdio.h>
philpem@52 5 #include "wd279x.h"
philpem@80 6 #include "keyboard.h"
philpem@18 7 #include "state.h"
philpem@18 8
philpem@62 9 int state_init(size_t base_ram_size, size_t exp_ram_size)
philpem@18 10 {
philpem@18 11 // Free RAM if it's allocated
philpem@60 12 if (state.base_ram != NULL)
philpem@60 13 free(state.base_ram);
philpem@62 14 if (state.exp_ram != NULL)
philpem@62 15 free(state.exp_ram);
philpem@18 16
philpem@18 17 // Initialise hardware registers
philpem@18 18 state.romlmap = false;
philpem@75 19 state.idmarw = state.dmaen = state.dmaenb = false;
philpem@75 20 state.dma_count = state.dma_address = 0;
philpem@75 21 state.pie = 0;
philpem@101 22 state.ee = 0;
philpem@75 23 state.leds = 0;
philpem@75 24 state.genstat = 0; // FIXME: check this
philpem@75 25 state.bsr0 = state.bsr1 = 0; // FIXME: check this
philpem@97 26 state.timer_enabled = state.timer_asserted = false;
philpem@62 27 // Allocate Base RAM, making sure the user has specified a valid RAM amount first
philpem@62 28 // Basically: 512KiB minimum, 2MiB maximum, in increments of 512KiB.
philpem@62 29 if ((base_ram_size < 512*1024) || (base_ram_size > 2048*1024) || ((base_ram_size % (512*1024)) != 0))
philpem@18 30 return -1;
philpem@62 31 state.base_ram = malloc(base_ram_size);
philpem@60 32 if (state.base_ram == NULL)
philpem@18 33 return -2;
philpem@62 34 state.base_ram_size = base_ram_size;
philpem@62 35
philpem@62 36 // Now allocate expansion RAM
philpem@62 37 // The difference here is that we can have zero bytes of Expansion RAM; we're not limited to having a minimum of 512KiB.
philpem@62 38 if ((exp_ram_size > 2048*1024) || ((exp_ram_size % (512*1024)) != 0))
philpem@62 39 return -1;
philpem@62 40 state.exp_ram = malloc(exp_ram_size);
philpem@62 41 if (state.exp_ram == NULL)
philpem@62 42 return -2;
philpem@62 43 state.exp_ram_size = exp_ram_size;
philpem@18 44
philpem@18 45 // Load ROMs
philpem@18 46 FILE *r14c, *r15c;
philpem@18 47 r14c = fopen("roms/14c.bin", "rb");
philpem@55 48 if (r14c == NULL) {
philpem@55 49 fprintf(stderr, "[state] Error loading roms/14c.bin.\n");
philpem@55 50 return -3;
philpem@55 51 }
philpem@18 52 r15c = fopen("roms/15c.bin", "rb");
philpem@55 53 if (r15c == NULL) {
philpem@55 54 fprintf(stderr, "[state] Error loading roms/15c.bin.\n");
philpem@55 55 return -3;
philpem@55 56 }
philpem@18 57
philpem@18 58 // get ROM file size
philpem@18 59 fseek(r14c, 0, SEEK_END);
philpem@18 60 size_t romlen = ftell(r14c);
philpem@18 61 fseek(r14c, 0, SEEK_SET);
philpem@18 62 fseek(r15c, 0, SEEK_END);
philpem@18 63 size_t romlen2 = ftell(r15c);
philpem@18 64 fseek(r15c, 0, SEEK_SET);
philpem@55 65 if (romlen2 != romlen) {
philpem@55 66 fprintf(stderr, "[state] ROMs are not the same size!\n");
philpem@55 67 return -3;
philpem@55 68 }
philpem@55 69 if ((romlen + romlen2) > ROM_SIZE) {
philpem@55 70 fprintf(stderr, "[state] ROM files are too large!\n");
philpem@55 71 return -3;
philpem@55 72 }
philpem@18 73
philpem@18 74 // sanity checks completed; load the ROMs!
philpem@18 75 uint8_t *romdat1, *romdat2;
philpem@18 76 romdat1 = malloc(romlen);
philpem@18 77 romdat2 = malloc(romlen2);
philpem@18 78 fread(romdat1, 1, romlen, r15c);
philpem@18 79 fread(romdat2, 1, romlen2, r14c);
philpem@18 80
philpem@18 81 // convert the ROM data
philpem@18 82 for (size_t i=0; i<(romlen + romlen2); i+=2) {
philpem@18 83 state.rom[i+0] = romdat1[i/2];
philpem@18 84 state.rom[i+1] = romdat2[i/2];
philpem@18 85 }
philpem@18 86
philpem@18 87 // TODO: if ROM buffer not filled, repeat the ROM data we read until it is (wraparound emulation)
philpem@18 88
philpem@18 89 // free the data arrays and close the files
philpem@18 90 free(romdat1);
philpem@18 91 free(romdat2);
philpem@18 92 fclose(r14c);
philpem@18 93 fclose(r15c);
philpem@18 94
philpem@52 95 // Initialise the disc controller
philpem@52 96 wd2797_init(&state.fdc_ctx);
philpem@80 97 // Initialise the keyboard controller
philpem@80 98 keyboard_init(&state.kbd);
philpem@52 99
philpem@18 100 return 0;
philpem@18 101 }
philpem@18 102
philpem@18 103 void state_done()
philpem@18 104 {
philpem@60 105 if (state.base_ram != NULL) {
philpem@60 106 free(state.base_ram);
philpem@60 107 state.base_ram = NULL;
philpem@18 108 }
philpem@62 109
philpem@62 110 if (state.exp_ram != NULL) {
philpem@62 111 free(state.exp_ram);
philpem@62 112 state.exp_ram = NULL;
philpem@62 113 }
philpem@62 114
philpem@52 115 // Deinitialise the disc controller
philpem@52 116 wd2797_done(&state.fdc_ctx);
philpem@18 117 }
philpem@18 118
philpem@18 119