From: Shamus Hammons <jlhamm@acm.org>
Date: Thu, 10 Nov 2011 15:54:55 +0000 (+0000)
Subject: Compilation fixes for the M68000 core.
X-Git-Tag: 2.0.2~10
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=323dc085eb9488b8d7e7b46060af3d99db21eac6;p=virtualjaguar

Compilation fixes for the M68000 core.
---

diff --git a/src/m68000/Makefile b/src/m68000/Makefile
index 8e45772..d1890c8 100644
--- a/src/m68000/Makefile
+++ b/src/m68000/Makefile
@@ -15,7 +15,7 @@ ARFLAGS := -rs
 # Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2
 CFLAGS  := -MMD -O2 -ffast-math -fomit-frame-pointer
 
-INCS    := -I./ -I./obj `sdl-config --cflags`
+INCS    := -I. -I./obj `sdl-config --cflags`
 
 OBJS = \
 	obj/cpustbl.o \
@@ -60,7 +60,7 @@ obj/cpustbl.c: obj/gencpu
 
 obj/gencpu: obj/cpudefs.c
 	@echo -e "\033[01;33m***\033[00;32m Generating gencpu...\033[00m"
-	@$(CC) $(CFLAGS) gencpu.c readcpu.c obj/cpudefs.c -o obj/gencpu -I./ -I./obj
+	@$(CC) $(CFLAGS) gencpu.c readcpu.c obj/cpudefs.c -o obj/gencpu -I. -I./obj
 
 obj/cpudefs.c: obj/build68k
 	@echo -e "\033[01;33m***\033[00;32m Generating cpudefs.c...\033[00m"
diff --git a/src/m68000/m68kinterface.c b/src/m68000/m68kinterface.c
index 5292ca5..d691b0e 100644
--- a/src/m68000/m68kinterface.c
+++ b/src/m68000/m68kinterface.c
@@ -49,9 +49,9 @@ extern int irq_ack_handler(int);
 
 // Function prototypes...
 STATIC_INLINE void m68ki_check_interrupts(void);
-void m68ki_exception_interrupt(uint intLevel);
+void m68ki_exception_interrupt(uint32_t intLevel);
 STATIC_INLINE uint32_t m68ki_init_exception(void);
-STATIC_INLINE void m68ki_stack_frame_3word(uint pc, uint sr);
+STATIC_INLINE void m68ki_stack_frame_3word(uint32_t pc, uint32_t sr);
 unsigned long IllegalOpcode(uint32_t opcode);
 void BuildCPUFunctionTable(void);
 
@@ -108,7 +108,7 @@ void m68k_set_cpu_type(unsigned int type)
 // Pulse the RESET line on the CPU
 void m68k_pulse_reset(void)
 {
-	static uint emulation_initialized = 0;
+	static uint32_t emulation_initialized = 0;
 
 	// The first call to this function initializes the opcode handler jump table
 	if (!emulation_initialized)
@@ -332,7 +332,7 @@ STATIC_INLINE void m68ki_check_interrupts(void)
 }
 
 // Service an interrupt request and start exception processing
-void m68ki_exception_interrupt(uint intLevel)
+void m68ki_exception_interrupt(uint32_t intLevel)
 {
 #if 0
 	uint vector;