diff options
| author | Benedikt Böhm <bb@xnull.de> | 2009-07-07 10:34:07 +0200 |
|---|---|---|
| committer | Benedikt Böhm <bb@xnull.de> | 2009-07-07 10:34:07 +0200 |
| commit | 4ad083bf274a972ed7286b9b52179e30873aa830 (patch) | |
| tree | c23346d09d906d61855ff1dfe3f42f43d0bc374d /src/emu/mem.c | |
| parent | 2ee0ef30cb01415cdb9cdbf4adc5ad279f44f661 (diff) | |
| download | swppy-4ad083bf274a972ed7286b9b52179e30873aa830.tar.gz swppy-4ad083bf274a972ed7286b9b52179e30873aa830.tar.xz swppy-4ad083bf274a972ed7286b9b52179e30873aa830.zip | |
implement memory bounds checking
Diffstat (limited to 'src/emu/mem.c')
| -rw-r--r-- | src/emu/mem.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/emu/mem.c b/src/emu/mem.c index cdbf2ae..21caafd 100644 --- a/src/emu/mem.c +++ b/src/emu/mem.c @@ -1,16 +1,21 @@ #include <stdint.h> #include <sys/types.h> #include <string.h> +#include <inttypes.h> #include "cpu.h" #include "mem.h" +#include "log.h" uint8_t *MEM; +uint64_t mem_size = 64 * 1024 * 1024; void store(size_t addr, uint32_t value) { if (addr & 0x2) trap(TRP_UNALIGNED); + if (addr >= mem_size) + trap(TRP_SEGV); memcpy(&MEM[addr], &value, 4); } @@ -19,12 +24,15 @@ uint32_t load(size_t addr) uint32_t tmp32; if (addr & 0x2) trap(TRP_UNALIGNED); + if (addr >= mem_size) + trap(TRP_SEGV); memcpy(&tmp32, &MEM[addr], 4); return tmp32; } void push(uint32_t value) { + //debug("push(%"PRIu32")", value); GPR[SP] -= 4; store(GPR[SP], value); } @@ -32,6 +40,7 @@ void push(uint32_t value) uint32_t pop(void) { uint32_t tmp32 = load(GPR[SP]); + //debug("pop(%"PRIu32")", tmp32); GPR[SP] += 4; return tmp32; } |