Search
lxdream.org :: lxdream/src/sh4/sh4core.in :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/sh4/sh4core.in
changeset 430:467519b050f4
prev401:f79327f39818
next490:1e0f9940e064
author nkeynes
date Mon Oct 08 12:09:06 2007 +0000 (12 years ago)
permissions -rw-r--r--
last change Fix compilation warnings
file annotate diff log raw
1.1 --- a/src/sh4/sh4core.in Thu Sep 20 08:37:19 2007 +0000
1.2 +++ b/src/sh4/sh4core.in Mon Oct 08 12:09:06 2007 +0000
1.3 @@ -1,5 +1,5 @@
1.4 /**
1.5 - * $Id: sh4core.in,v 1.8 2007-09-20 08:37:19 nkeynes Exp $
1.6 + * $Id: sh4core.in,v 1.9 2007-10-08 12:06:01 nkeynes Exp $
1.7 *
1.8 * SH4 emulation core, and parent module for all the SH4 peripheral
1.9 * modules.
1.10 @@ -20,12 +20,14 @@
1.11 #define MODULE sh4_module
1.12 #include <math.h>
1.13 #include "dream.h"
1.14 +#include "dreamcast.h"
1.15 +#include "eventq.h"
1.16 +#include "mem.h"
1.17 +#include "clock.h"
1.18 +#include "syscall.h"
1.19 #include "sh4/sh4core.h"
1.20 #include "sh4/sh4mmio.h"
1.21 #include "sh4/intc.h"
1.22 -#include "mem.h"
1.23 -#include "clock.h"
1.24 -#include "syscall.h"
1.25
1.26 #define SH4_CALLTRACE 1
1.27
1.28 @@ -126,7 +128,7 @@
1.29 static int call_stack_depth = 0;
1.30 int sh4_call_trace_on = 0;
1.31
1.32 -static inline trace_call( sh4addr_t source, sh4addr_t dest )
1.33 +static inline void trace_call( sh4addr_t source, sh4addr_t dest )
1.34 {
1.35 if( call_stack_depth < MAX_CALLSTACK ) {
1.36 call_stack[call_stack_depth].call_addr = source;
1.37 @@ -136,7 +138,7 @@
1.38 call_stack_depth++;
1.39 }
1.40
1.41 -static inline trace_return( sh4addr_t source, sh4addr_t dest )
1.42 +static inline void trace_return( sh4addr_t source, sh4addr_t dest )
1.43 {
1.44 if( call_stack_depth > 0 ) {
1.45 call_stack_depth--;
.