Tue, 15 Nov 2011 10:12:37 +0000
[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@88 | 1 | #ifndef _UTILS_H |
| philpem@88 | 2 | #define _UTILS_H |
| philpem@71 | 3 | |
| philpem@89 | 4 | #include <stdio.h> |
| philpem@89 | 5 | |
| philpem@71 | 6 | #ifndef NDEBUG |
| philpem@71 | 7 | /// Log a message to stderr |
| philpem@71 | 8 | # define LOG(x, ...) do { fprintf(stderr, "%s:%d:%s(): " x "\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__); } while (0) |
| philpem@98 | 9 | # define LOGS(x) do { fprintf(stderr, "%s:%d:%s(): " x "\n", __FILE__, __LINE__, __PRETTY_FUNCTION__); } while (0) |
| philpem@71 | 10 | /// Log a message to stderr if 'cond' is true |
| philpem@71 | 11 | # define LOG_IF(cond, x, ...) do { if (cond) fprintf(stderr, "%s:%d:%s(): " x "\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__); } while (0) |
| philpem@98 | 12 | # define LOG_IFS(cond, x) do { if (cond) fprintf(stderr, "%s:%d:%s(): " x "\n", __FILE__, __LINE__, __PRETTY_FUNCTION__); } while (0) |
| philpem@71 | 13 | #else |
| philpem@71 | 14 | #define LOG(x, ...) |
| philpem@98 | 15 | #define LOGS(x) |
| philpem@71 | 16 | #define LOG_IF(cond, x, ...) |
| philpem@98 | 17 | #define LOG_IFS(cond, x) |
| philpem@71 | 18 | #endif |
| philpem@71 | 19 | |
| philpem@88 | 20 | /// Get the number of elements in an array |
| philpem@88 | 21 | #define NELEMS(x) (sizeof(x)/sizeof(x[0])) |
| philpem@88 | 22 | |
| philpem@71 | 23 | #endif // _H_UTILS |