Merge pull request #100 from dominicbeesley/master

vsprojx fix for 32016 and a debugger bugfix
stardot · Mar 17, 2020 · 696d30b · 696d30b
2 parents b782546 + f6ea88a
commit 696d30b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ autom4te.cache/
 b-em
 b-em.exe
 b-em.res
+b-em.ilk
 config.log
 config.status
 configure
@@ -42,3 +43,5 @@ b-em.ipdb
 b-em.iobj
 b-em.pdb
 src/hdfmt.exe
+scsi/*
+
diff --git a/src/6502.c b/src/6502.c
@@ -292,10 +292,14 @@ static inline uint16_t read_zp_indirect(uint16_t zp)
 static uint32_t do_readmem(uint32_t addr)
 {
 
+        if (addr >= 0x10000)
+            return 0xFF;
+
         if (pc == addr)
-                fetchc[addr] = 31;
+            fetchc[addr] = 31;
         else
-                readc[addr] = 31;
+            readc[addr] = 31;
+
         if (memstat[vis20k][addr >> 8])
                 return memlook[vis20k][addr >> 8][addr];
         if (MASTER && (acccon & 0x40) && addr >= 0xFC00)
@@ -449,7 +453,11 @@ static void do_writemem(uint32_t addr, uint32_t val)
 {
         int c;
 
+        if (addr >= 0x10000)
+            return;
+
         writec[addr] = 31;
+
         c = memstat[vis20k][addr >> 8];
         if (c == 1) {
                 memlook[vis20k][addr >> 8][addr] = val;

diff --git a/src/b-em.vcxproj b/src/b-em.vcxproj
@@ -68,7 +68,7 @@
       </PrecompiledHeader>
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>BEM;WIN32;INCLUDE_DEBUGGER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>USE_MEMORY_POINTER;BEM;WIN32;INCLUDE_DEBUGGER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>UNICODE;_UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -86,7 +86,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>BEM;WIN32;INCLUDE_DEBUGGER;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>USE_MEMORY_POINTER;BEM;WIN32;INCLUDE_DEBUGGER;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UndefinePreprocessorDefinitions>UNICODE;_UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>