summaryrefslogtreecommitdiffstats
path: root/src/emu/mem.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/mem.c')
-rw-r--r--src/emu/mem.c9
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;
}