Skip to content

Commit

Permalink
Merge branch 'master' into sf/watform
Browse files Browse the repository at this point in the history
  • Loading branch information
Steve Fosdick committed Mar 10, 2023
2 parents 3871476 + 932f97d commit 23e34b5
Show file tree
Hide file tree
Showing 4 changed files with 139 additions and 3 deletions.
4 changes: 3 additions & 1 deletion src/ARMulator/armmem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
Copyright (C) 2010 Kieran Mockford.
*/

#include <stdint.h>

#include "armopts.h"
#include "armos.h"
#include "armdefs.h"
#include "ansidecl.h"

#include "tube.h"
#include "../tube.h"

#ifdef VALIDATE /* for running the validate suite */
#define TUBE 48 * 1024 * 1024 /* write a char on the screen */
Expand Down
36 changes: 34 additions & 2 deletions src/b-em.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>VERSION="vsX";USE_MEMORY_POINTER;BEM;WIN32;INCLUDE_DEBUGGER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>VERSION="vsX";USE_MEMORY_POINTER;BEM;MODET;MODE32;BEEBEM;WIN32;INCLUDE_DEBUGGER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UndefinePreprocessorDefinitions>UNICODE;_UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
<AdditionalIncludeDirectories>..\packages\Allegro.5.2.6\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
Expand All @@ -87,7 +87,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>VERSION="vsX";USE_MEMORY_POINTER;BEM;WIN32;INCLUDE_DEBUGGER;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>VERSION="vsX";USE_MEMORY_POINTER;BEM;WIN32;MODET;MODE32;BEEBEM;INCLUDE_DEBUGGER;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UndefinePreprocessorDefinitions>UNICODE;_UNICODE;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<AdditionalIncludeDirectories>..\packages\Allegro.5.2.6\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
Expand All @@ -112,6 +112,22 @@
<ClInclude Include="acia.h" />
<ClInclude Include="adc.h" />
<ClInclude Include="arm.h" />
<ClInclude Include="ARMulator\acconfig.h" />
<ClInclude Include="ARMulator\ansidecl.h" />
<ClInclude Include="ARMulator\armdefs.h" />
<ClInclude Include="ARMulator\armdis.h" />
<ClInclude Include="ARMulator\armemu.h" />
<ClInclude Include="ARMulator\armfpe.h" />
<ClInclude Include="ARMulator\armopts.h" />
<ClInclude Include="ARMulator\armos.h" />
<ClInclude Include="ARMulator\bag.h" />
<ClInclude Include="ARMulator\config.h" />
<ClInclude Include="ARMulator\dbg_conf.h" />
<ClInclude Include="ARMulator\dbg_cp.h" />
<ClInclude Include="ARMulator\dbg_hif.h" />
<ClInclude Include="ARMulator\dbg_rdi.h" />
<ClInclude Include="ARMulator\gdbhost.h" />
<ClInclude Include="ARMulator\iwmmxt.h" />
<ClInclude Include="b-em.h" />
<ClInclude Include="bbctext.h" />
<ClInclude Include="cmos.h" />
Expand All @@ -136,6 +152,7 @@
<ClInclude Include="disc.h" />
<ClInclude Include="fdi.h" />
<ClInclude Include="fdi2raw.h" />
<ClInclude Include="fullscreen.h" />
<ClInclude Include="gui-allegro.h" />
<ClInclude Include="hfe.h" />
<ClInclude Include="i8271.h" />
Expand All @@ -147,11 +164,13 @@
<ClInclude Include="led.h" />
<ClInclude Include="logging.h" />
<ClInclude Include="main.h" />
<ClInclude Include="map.h" />
<ClInclude Include="mc6809nc\mc6809.h" />
<ClInclude Include="mc6809nc\mc6809_debug.h" />
<ClInclude Include="mc6809nc\mc6809_dis.h" />
<ClInclude Include="mem.h" />
<ClInclude Include="midi.h" />
<ClInclude Include="mmccard.h" />
<ClInclude Include="model.h" />
<ClInclude Include="mouse.h" />
<ClInclude Include="music2000.h" />
Expand Down Expand Up @@ -186,6 +205,8 @@
<ClInclude Include="sid_b-em.h" />
<ClInclude Include="sn76489.h" />
<ClInclude Include="sound.h" />
<ClInclude Include="sprow.h" />
<ClInclude Include="ssinline.h" />
<ClInclude Include="sysacia.h" />
<ClInclude Include="sysvia.h" />
<ClInclude Include="tape.h" />
Expand Down Expand Up @@ -216,6 +237,13 @@
<ClCompile Include="acia.c" />
<ClCompile Include="adc.c" />
<ClCompile Include="arm.c" />
<ClCompile Include="ARMulator\armdis.cpp" />
<ClCompile Include="ARMulator\armemu.c" />
<ClCompile Include="ARMulator\arminit.c" />
<ClCompile Include="ARMulator\armmem.c" />
<ClCompile Include="ARMulator\armsupp.c" />
<ClCompile Include="ARMulator\bag.c" />
<ClCompile Include="ARMulator\thumbemu.c" />
<ClCompile Include="cmos.c" />
<ClCompile Include="compactcmos.c" />
<ClCompile Include="compact_joystick.c" />
Expand All @@ -238,6 +266,7 @@
<ClCompile Include="disc.c" />
<ClCompile Include="fdi.c" />
<ClCompile Include="fdi2raw.c" />
<ClCompile Include="fullscreen.c" />
<ClCompile Include="gui-allegro.c" />
<ClCompile Include="hfe.c" />
<ClCompile Include="i8271.c" />
Expand All @@ -249,11 +278,13 @@
<ClCompile Include="led.c" />
<ClCompile Include="logging.c" />
<ClCompile Include="main.c" />
<ClCompile Include="map.c" />
<ClCompile Include="mc6809nc\mc6809nc.c" />
<ClCompile Include="mc6809nc\mc6809_debug.c" />
<ClCompile Include="mc6809nc\mc6809_dis.c" />
<ClCompile Include="mem.c" />
<ClCompile Include="midi-windows.c" />
<ClCompile Include="mmccard.c" />
<ClCompile Include="model.c" />
<ClCompile Include="mouse.c" />
<ClCompile Include="music2000.c" />
Expand Down Expand Up @@ -295,6 +326,7 @@
<ClCompile Include="serial.c" />
<ClCompile Include="sn76489.c" />
<ClCompile Include="sound.c" />
<ClCompile Include="sprow.c" />
<ClCompile Include="sysacia.c" />
<ClCompile Include="sysvia.c" />
<ClCompile Include="tape.c" />
Expand Down
96 changes: 96 additions & 0 deletions src/b-em.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,69 @@
<ClInclude Include="pdp11\pdp11_debug.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="sprow.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ssinline.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\acconfig.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\ansidecl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\armdefs.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\armdis.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\armemu.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\armfpe.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\armopts.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\armos.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\bag.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\config.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\dbg_conf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\dbg_cp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\dbg_hif.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\dbg_rdi.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\gdbhost.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ARMulator\iwmmxt.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="map.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="mmccard.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="fullscreen.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="b-em.rc">
Expand Down Expand Up @@ -634,6 +697,39 @@
<ClCompile Include="pdp11\pdp11_debug.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="sprow.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ARMulator\armdis.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ARMulator\armemu.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ARMulator\arminit.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ARMulator\armmem.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ARMulator\armsupp.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ARMulator\bag.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ARMulator\thumbemu.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="map.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mmccard.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="fullscreen.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="b-em.ico">
Expand Down
6 changes: 6 additions & 0 deletions src/gui-allegro.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@

#define ROM_LABEL_LEN 50

/* pclose() and popen() on Windows are _pclose() and _popen() */
#ifdef _WIN32
# define pclose _pclose
# define popen _popen
#endif

typedef struct {
const char *label;
int itemno;
Expand Down

0 comments on commit 23e34b5

Please sign in to comment.