Search
lxdream.org :: lxdream :: r1201:5502572ce192
lxdream 0.9.1
released Jun 29
Download Now
changeset1201:5502572ce192
parent1200:3b2097efa97d
child1202:01ae5cbad4c8
authornkeynes
dateThu Dec 22 18:10:36 2011 +1000 (7 years ago)
Only build shadow "core" if translation is enabled.
Guard call to sh4_translate_set_profile_blocks
Fix shadow compile when building without frame-address support (although
it's not going to actually work yet)
src/Makefile.am
src/Makefile.in
src/main.c
src/sh4/shadow.c
1.1 --- a/src/Makefile.am Wed Dec 21 17:13:08 2011 +1000
1.2 +++ b/src/Makefile.am Thu Dec 22 18:10:36 2011 +1000
1.3 @@ -52,7 +52,7 @@
1.4 sh4/mmu.c sh4/sh4core.c sh4/sh4core.h sh4/sh4dasm.c sh4/sh4dasm.h \
1.5 sh4/sh4mmio.c sh4/sh4mmio.h sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h \
1.6 xlat/xltcache.c xlat/xltcache.h sh4/sh4.h sh4/dmac.h sh4/pmm.c \
1.7 - sh4/cache.c sh4/mmu.h sh4/shadow.c \
1.8 + sh4/cache.c sh4/mmu.h \
1.9 aica/armcore.c aica/armcore.h aica/armdasm.c aica/armdasm.h aica/armmem.c \
1.10 aica/aica.c aica/aica.h aica/audio.c aica/audio.h \
1.11 pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c pvr2/pvr2mmio.h \
1.12 @@ -84,7 +84,7 @@
1.13 if BUILD_SH4X86
1.14 lxdream_SOURCES += sh4/sh4x86.c xlat/x86/x86op.h \
1.15 xlat/x86/ia32abi.h xlat/x86/amd64abi.h \
1.16 - sh4/sh4trans.c sh4/sh4trans.h sh4/mmux86.c \
1.17 + sh4/sh4trans.c sh4/sh4trans.h sh4/mmux86.c sh4/shadow.c \
1.18 x86dasm/x86dasm.c x86dasm/x86dasm.h \
1.19 x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c \
1.20 x86dasm/ansidecl.h x86dasm/bfd.h x86dasm/dis-asm.h \
2.1 --- a/src/Makefile.in Wed Dec 21 17:13:08 2011 +1000
2.2 +++ b/src/Makefile.in Thu Dec 22 18:10:36 2011 +1000
2.3 @@ -44,7 +44,7 @@
2.4 @BUILD_SHARED_TRUE@am__append_1 = plugin.c plugin.h
2.5 @BUILD_SH4X86_TRUE@am__append_2 = sh4/sh4x86.c xlat/x86/x86op.h \
2.6 @BUILD_SH4X86_TRUE@ xlat/x86/ia32abi.h xlat/x86/amd64abi.h \
2.7 -@BUILD_SH4X86_TRUE@ sh4/sh4trans.c sh4/sh4trans.h sh4/mmux86.c \
2.8 +@BUILD_SH4X86_TRUE@ sh4/sh4trans.c sh4/sh4trans.h sh4/mmux86.c sh4/shadow.c \
2.9 @BUILD_SH4X86_TRUE@ x86dasm/x86dasm.c x86dasm/x86dasm.h \
2.10 @BUILD_SH4X86_TRUE@ x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c \
2.11 @BUILD_SH4X86_TRUE@ x86dasm/ansidecl.h x86dasm/bfd.h x86dasm/dis-asm.h \
2.12 @@ -152,21 +152,21 @@
2.13 sh4/sh4core.h sh4/sh4dasm.c sh4/sh4dasm.h sh4/sh4mmio.c \
2.14 sh4/sh4mmio.h sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h \
2.15 xlat/xltcache.c xlat/xltcache.h sh4/sh4.h sh4/dmac.h sh4/pmm.c \
2.16 - sh4/cache.c sh4/mmu.h sh4/shadow.c aica/armcore.c \
2.17 - aica/armcore.h aica/armdasm.c aica/armdasm.h aica/armmem.c \
2.18 - aica/aica.c aica/aica.h aica/audio.c aica/audio.h pvr2/pvr2.c \
2.19 - pvr2/pvr2.h pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c \
2.20 - pvr2/rendsort.c pvr2/tileiter.h pvr2/shaders.glsl \
2.21 - pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c \
2.22 - pvr2/scene.h pvr2/gl_sl.c pvr2/shaders.h pvr2/shaders.def \
2.23 - pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c maple/maple.c \
2.24 - maple/maple.h maple/controller.c maple/kbd.c maple/mouse.c \
2.25 - maple/lightgun.c maple/vmu.c loader.c loader.h elf.h \
2.26 - bootstrap.c bootstrap.h util.c gdlist.c gdlist.h vmu/vmuvol.c \
2.27 - vmu/vmuvol.h vmu/vmulist.c vmu/vmulist.h display.c display.h \
2.28 - dckeysyms.h drivers/audio_null.c drivers/video_null.c \
2.29 - drivers/video_gl.c drivers/video_gl.h drivers/gl_fbo.c \
2.30 - drivers/gl_vbo.c drivers/serial_unix.c drivers/cdrom/cdrom.h \
2.31 + sh4/cache.c sh4/mmu.h aica/armcore.c aica/armcore.h \
2.32 + aica/armdasm.c aica/armdasm.h aica/armmem.c aica/aica.c \
2.33 + aica/aica.h aica/audio.c aica/audio.h pvr2/pvr2.c pvr2/pvr2.h \
2.34 + pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c pvr2/rendsort.c \
2.35 + pvr2/tileiter.h pvr2/shaders.glsl pvr2/texcache.c pvr2/yuv.c \
2.36 + pvr2/rendsave.c pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c \
2.37 + pvr2/shaders.h pvr2/shaders.def pvr2/glutil.c pvr2/glutil.h \
2.38 + pvr2/glrender.c maple/maple.c maple/maple.h maple/controller.c \
2.39 + maple/kbd.c maple/mouse.c maple/lightgun.c maple/vmu.c \
2.40 + loader.c loader.h elf.h bootstrap.c bootstrap.h util.c \
2.41 + gdlist.c gdlist.h vmu/vmuvol.c vmu/vmuvol.h vmu/vmulist.c \
2.42 + vmu/vmulist.h display.c display.h dckeysyms.h \
2.43 + drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \
2.44 + drivers/video_gl.h drivers/gl_fbo.c drivers/gl_vbo.c \
2.45 + drivers/serial_unix.c drivers/cdrom/cdrom.h \
2.46 drivers/cdrom/cdrom.c drivers/cdrom/drive.h \
2.47 drivers/cdrom/sector.h drivers/cdrom/sector.c \
2.48 drivers/cdrom/defs.h drivers/cdrom/cd_nrg.c \
2.49 @@ -180,30 +180,31 @@
2.50 sh4/sh4core.in sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in \
2.51 hotkeys.c hotkeys.h plugin.c plugin.h sh4/sh4x86.c \
2.52 xlat/x86/x86op.h xlat/x86/ia32abi.h xlat/x86/amd64abi.h \
2.53 - sh4/sh4trans.c sh4/sh4trans.h sh4/mmux86.c x86dasm/x86dasm.c \
2.54 - x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
2.55 - x86dasm/dis-buf.c x86dasm/ansidecl.h x86dasm/bfd.h \
2.56 - x86dasm/dis-asm.h x86dasm/symcat.h x86dasm/sysdep.h \
2.57 - gtkui/gtkui.c gtkui/gtkui.h gtkui/gtk_win.c gtkui/gtkcb.c \
2.58 - gtkui/gtk_cfg.c gtkui/gtk_mmio.c gtkui/gtk_debug.c \
2.59 - gtkui/gtk_dump.c gtkui/gtk_ctrl.c gtkui/gtk_gd.c \
2.60 - drivers/io_glib.c drivers/video_gtk.c cocoaui/cocoaui.m \
2.61 - cocoaui/cocoaui.h cocoaui/cocoa_cfg.m cocoaui/cocoa_win.m \
2.62 - cocoaui/cocoa_gd.m cocoaui/cocoa_prefs.m cocoaui/cocoa_ctrl.m \
2.63 - cocoaui/paths_osx.m drivers/io_osx.m drivers/video_osx.m \
2.64 - drivers/mac_keymap.h drivers/mac_keymap.txt paths_unix.c \
2.65 - drivers/video_gdk.c drivers/video_glx.c drivers/video_glx.h \
2.66 - drivers/video_nsgl.m drivers/video_nsgl.h drivers/audio_osx.m \
2.67 - drivers/audio_sdl.c drivers/audio_pulse.c drivers/audio_esd.c \
2.68 - drivers/audio_alsa.c drivers/input_lirc.c \
2.69 - drivers/cdrom/cd_linux.c drivers/cdrom/cd_osx.c \
2.70 - drivers/osx_iokit.m drivers/osx_iokit.h \
2.71 + sh4/sh4trans.c sh4/sh4trans.h sh4/mmux86.c sh4/shadow.c \
2.72 + x86dasm/x86dasm.c x86dasm/x86dasm.h x86dasm/i386-dis.c \
2.73 + x86dasm/dis-init.c x86dasm/dis-buf.c x86dasm/ansidecl.h \
2.74 + x86dasm/bfd.h x86dasm/dis-asm.h x86dasm/symcat.h \
2.75 + x86dasm/sysdep.h gtkui/gtkui.c gtkui/gtkui.h gtkui/gtk_win.c \
2.76 + gtkui/gtkcb.c gtkui/gtk_cfg.c gtkui/gtk_mmio.c \
2.77 + gtkui/gtk_debug.c gtkui/gtk_dump.c gtkui/gtk_ctrl.c \
2.78 + gtkui/gtk_gd.c drivers/io_glib.c drivers/video_gtk.c \
2.79 + cocoaui/cocoaui.m cocoaui/cocoaui.h cocoaui/cocoa_cfg.m \
2.80 + cocoaui/cocoa_win.m cocoaui/cocoa_gd.m cocoaui/cocoa_prefs.m \
2.81 + cocoaui/cocoa_ctrl.m cocoaui/paths_osx.m drivers/io_osx.m \
2.82 + drivers/video_osx.m drivers/mac_keymap.h \
2.83 + drivers/mac_keymap.txt paths_unix.c drivers/video_gdk.c \
2.84 + drivers/video_glx.c drivers/video_glx.h drivers/video_nsgl.m \
2.85 + drivers/video_nsgl.h drivers/audio_osx.m drivers/audio_sdl.c \
2.86 + drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \
2.87 + drivers/input_lirc.c drivers/cdrom/cd_linux.c \
2.88 + drivers/cdrom/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h \
2.89 drivers/cdrom/cd_none.c drivers/joy_linux.c \
2.90 drivers/joy_linux.h
2.91 @BUILD_SHARED_TRUE@am__objects_1 = lxdream-plugin.$(OBJEXT)
2.92 @BUILD_SH4X86_TRUE@am__objects_2 = lxdream-sh4x86.$(OBJEXT) \
2.93 @BUILD_SH4X86_TRUE@ lxdream-sh4trans.$(OBJEXT) \
2.94 @BUILD_SH4X86_TRUE@ lxdream-mmux86.$(OBJEXT) \
2.95 +@BUILD_SH4X86_TRUE@ lxdream-shadow.$(OBJEXT) \
2.96 @BUILD_SH4X86_TRUE@ lxdream-x86dasm.$(OBJEXT) \
2.97 @BUILD_SH4X86_TRUE@ lxdream-i386-dis.$(OBJEXT) \
2.98 @BUILD_SH4X86_TRUE@ lxdream-dis-init.$(OBJEXT) \
2.99 @@ -259,36 +260,35 @@
2.100 lxdream-sh4mmio.$(OBJEXT) lxdream-scif.$(OBJEXT) \
2.101 lxdream-sh4stat.$(OBJEXT) lxdream-xltcache.$(OBJEXT) \
2.102 lxdream-pmm.$(OBJEXT) lxdream-cache.$(OBJEXT) \
2.103 - lxdream-shadow.$(OBJEXT) lxdream-armcore.$(OBJEXT) \
2.104 - lxdream-armdasm.$(OBJEXT) lxdream-armmem.$(OBJEXT) \
2.105 - lxdream-aica.$(OBJEXT) lxdream-audio.$(OBJEXT) \
2.106 - lxdream-pvr2.$(OBJEXT) lxdream-pvr2mem.$(OBJEXT) \
2.107 - lxdream-tacore.$(OBJEXT) lxdream-rendsort.$(OBJEXT) \
2.108 - lxdream-texcache.$(OBJEXT) lxdream-yuv.$(OBJEXT) \
2.109 - lxdream-rendsave.$(OBJEXT) lxdream-scene.$(OBJEXT) \
2.110 - lxdream-gl_sl.$(OBJEXT) lxdream-glutil.$(OBJEXT) \
2.111 - lxdream-glrender.$(OBJEXT) lxdream-maple.$(OBJEXT) \
2.112 - lxdream-controller.$(OBJEXT) lxdream-kbd.$(OBJEXT) \
2.113 - lxdream-mouse.$(OBJEXT) lxdream-lightgun.$(OBJEXT) \
2.114 - lxdream-vmu.$(OBJEXT) lxdream-loader.$(OBJEXT) \
2.115 - lxdream-bootstrap.$(OBJEXT) lxdream-util.$(OBJEXT) \
2.116 - lxdream-gdlist.$(OBJEXT) lxdream-vmuvol.$(OBJEXT) \
2.117 - lxdream-vmulist.$(OBJEXT) lxdream-display.$(OBJEXT) \
2.118 - lxdream-audio_null.$(OBJEXT) lxdream-video_null.$(OBJEXT) \
2.119 - lxdream-video_gl.$(OBJEXT) lxdream-gl_fbo.$(OBJEXT) \
2.120 - lxdream-gl_vbo.$(OBJEXT) lxdream-serial_unix.$(OBJEXT) \
2.121 - lxdream-cdrom.$(OBJEXT) lxdream-sector.$(OBJEXT) \
2.122 - lxdream-cd_nrg.$(OBJEXT) lxdream-cd_cdi.$(OBJEXT) \
2.123 - lxdream-cd_gdi.$(OBJEXT) lxdream-edc_ecc.$(OBJEXT) \
2.124 - lxdream-drive.$(OBJEXT) lxdream-cd_mmc.$(OBJEXT) \
2.125 - lxdream-isofs.$(OBJEXT) lxdream-isomem.$(OBJEXT) \
2.126 - lxdream-hotkeys.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
2.127 - $(am__objects_3) $(am__objects_4) $(am__objects_5) \
2.128 - $(am__objects_6) $(am__objects_7) $(am__objects_8) \
2.129 - $(am__objects_9) $(am__objects_10) $(am__objects_11) \
2.130 - $(am__objects_12) $(am__objects_13) $(am__objects_14) \
2.131 - $(am__objects_15) $(am__objects_16) $(am__objects_17) \
2.132 - $(am__objects_18)
2.133 + lxdream-armcore.$(OBJEXT) lxdream-armdasm.$(OBJEXT) \
2.134 + lxdream-armmem.$(OBJEXT) lxdream-aica.$(OBJEXT) \
2.135 + lxdream-audio.$(OBJEXT) lxdream-pvr2.$(OBJEXT) \
2.136 + lxdream-pvr2mem.$(OBJEXT) lxdream-tacore.$(OBJEXT) \
2.137 + lxdream-rendsort.$(OBJEXT) lxdream-texcache.$(OBJEXT) \
2.138 + lxdream-yuv.$(OBJEXT) lxdream-rendsave.$(OBJEXT) \
2.139 + lxdream-scene.$(OBJEXT) lxdream-gl_sl.$(OBJEXT) \
2.140 + lxdream-glutil.$(OBJEXT) lxdream-glrender.$(OBJEXT) \
2.141 + lxdream-maple.$(OBJEXT) lxdream-controller.$(OBJEXT) \
2.142 + lxdream-kbd.$(OBJEXT) lxdream-mouse.$(OBJEXT) \
2.143 + lxdream-lightgun.$(OBJEXT) lxdream-vmu.$(OBJEXT) \
2.144 + lxdream-loader.$(OBJEXT) lxdream-bootstrap.$(OBJEXT) \
2.145 + lxdream-util.$(OBJEXT) lxdream-gdlist.$(OBJEXT) \
2.146 + lxdream-vmuvol.$(OBJEXT) lxdream-vmulist.$(OBJEXT) \
2.147 + lxdream-display.$(OBJEXT) lxdream-audio_null.$(OBJEXT) \
2.148 + lxdream-video_null.$(OBJEXT) lxdream-video_gl.$(OBJEXT) \
2.149 + lxdream-gl_fbo.$(OBJEXT) lxdream-gl_vbo.$(OBJEXT) \
2.150 + lxdream-serial_unix.$(OBJEXT) lxdream-cdrom.$(OBJEXT) \
2.151 + lxdream-sector.$(OBJEXT) lxdream-cd_nrg.$(OBJEXT) \
2.152 + lxdream-cd_cdi.$(OBJEXT) lxdream-cd_gdi.$(OBJEXT) \
2.153 + lxdream-edc_ecc.$(OBJEXT) lxdream-drive.$(OBJEXT) \
2.154 + lxdream-cd_mmc.$(OBJEXT) lxdream-isofs.$(OBJEXT) \
2.155 + lxdream-isomem.$(OBJEXT) lxdream-hotkeys.$(OBJEXT) \
2.156 + $(am__objects_1) $(am__objects_2) $(am__objects_3) \
2.157 + $(am__objects_4) $(am__objects_5) $(am__objects_6) \
2.158 + $(am__objects_7) $(am__objects_8) $(am__objects_9) \
2.159 + $(am__objects_10) $(am__objects_11) $(am__objects_12) \
2.160 + $(am__objects_13) $(am__objects_14) $(am__objects_15) \
2.161 + $(am__objects_16) $(am__objects_17) $(am__objects_18)
2.162 lxdream_OBJECTS = $(am_lxdream_OBJECTS)
2.163 lxdream_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
2.164 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
2.165 @@ -584,39 +584,38 @@
2.166 sh4/sh4dasm.h sh4/sh4mmio.c sh4/sh4mmio.h sh4/scif.c \
2.167 sh4/sh4stat.c sh4/sh4stat.h xlat/xltcache.c xlat/xltcache.h \
2.168 sh4/sh4.h sh4/dmac.h sh4/pmm.c sh4/cache.c sh4/mmu.h \
2.169 - sh4/shadow.c aica/armcore.c aica/armcore.h aica/armdasm.c \
2.170 - aica/armdasm.h aica/armmem.c aica/aica.c aica/aica.h \
2.171 - aica/audio.c aica/audio.h pvr2/pvr2.c pvr2/pvr2.h \
2.172 - pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c pvr2/rendsort.c \
2.173 - pvr2/tileiter.h pvr2/shaders.glsl pvr2/texcache.c pvr2/yuv.c \
2.174 - pvr2/rendsave.c pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c \
2.175 - pvr2/shaders.h pvr2/shaders.def pvr2/glutil.c pvr2/glutil.h \
2.176 - pvr2/glrender.c maple/maple.c maple/maple.h maple/controller.c \
2.177 - maple/kbd.c maple/mouse.c maple/lightgun.c maple/vmu.c \
2.178 - loader.c loader.h elf.h bootstrap.c bootstrap.h util.c \
2.179 - gdlist.c gdlist.h vmu/vmuvol.c vmu/vmuvol.h vmu/vmulist.c \
2.180 - vmu/vmulist.h display.c display.h dckeysyms.h \
2.181 - drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \
2.182 - drivers/video_gl.h drivers/gl_fbo.c drivers/gl_vbo.c \
2.183 - drivers/serial_unix.c drivers/cdrom/cdrom.h \
2.184 - drivers/cdrom/cdrom.c drivers/cdrom/drive.h \
2.185 - drivers/cdrom/sector.h drivers/cdrom/sector.c \
2.186 - drivers/cdrom/defs.h drivers/cdrom/cd_nrg.c \
2.187 - drivers/cdrom/cd_cdi.c drivers/cdrom/cd_gdi.c \
2.188 - drivers/cdrom/edc_ecc.c drivers/cdrom/ecc.h \
2.189 - drivers/cdrom/drive.c drivers/cdrom/edc_crctable.h \
2.190 - drivers/cdrom/edc_encoder.h drivers/cdrom/cdimpl.h \
2.191 - drivers/cdrom/edc_l2sq.h drivers/cdrom/edc_scramble.h \
2.192 - drivers/cdrom/cd_mmc.c drivers/cdrom/isofs.h \
2.193 - drivers/cdrom/isofs.c drivers/cdrom/isomem.c sh4/sh4.def \
2.194 - sh4/sh4core.in sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in \
2.195 - hotkeys.c hotkeys.h $(am__append_1) $(am__append_2) \
2.196 - $(am__append_4) $(am__append_5) $(am__append_6) \
2.197 - $(am__append_7) $(am__append_8) $(am__append_9) \
2.198 - $(am__append_10) $(am__append_17) $(am__append_19) \
2.199 - $(am__append_21) $(am__append_23) $(am__append_25) \
2.200 - $(am__append_27) $(am__append_28) $(am__append_29) \
2.201 - $(am__append_30)
2.202 + aica/armcore.c aica/armcore.h aica/armdasm.c aica/armdasm.h \
2.203 + aica/armmem.c aica/aica.c aica/aica.h aica/audio.c \
2.204 + aica/audio.h pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c \
2.205 + pvr2/pvr2mmio.h pvr2/tacore.c pvr2/rendsort.c pvr2/tileiter.h \
2.206 + pvr2/shaders.glsl pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c \
2.207 + pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c pvr2/shaders.h \
2.208 + pvr2/shaders.def pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c \
2.209 + maple/maple.c maple/maple.h maple/controller.c maple/kbd.c \
2.210 + maple/mouse.c maple/lightgun.c maple/vmu.c loader.c loader.h \
2.211 + elf.h bootstrap.c bootstrap.h util.c gdlist.c gdlist.h \
2.212 + vmu/vmuvol.c vmu/vmuvol.h vmu/vmulist.c vmu/vmulist.h \
2.213 + display.c display.h dckeysyms.h drivers/audio_null.c \
2.214 + drivers/video_null.c drivers/video_gl.c drivers/video_gl.h \
2.215 + drivers/gl_fbo.c drivers/gl_vbo.c drivers/serial_unix.c \
2.216 + drivers/cdrom/cdrom.h drivers/cdrom/cdrom.c \
2.217 + drivers/cdrom/drive.h drivers/cdrom/sector.h \
2.218 + drivers/cdrom/sector.c drivers/cdrom/defs.h \
2.219 + drivers/cdrom/cd_nrg.c drivers/cdrom/cd_cdi.c \
2.220 + drivers/cdrom/cd_gdi.c drivers/cdrom/edc_ecc.c \
2.221 + drivers/cdrom/ecc.h drivers/cdrom/drive.c \
2.222 + drivers/cdrom/edc_crctable.h drivers/cdrom/edc_encoder.h \
2.223 + drivers/cdrom/cdimpl.h drivers/cdrom/edc_l2sq.h \
2.224 + drivers/cdrom/edc_scramble.h drivers/cdrom/cd_mmc.c \
2.225 + drivers/cdrom/isofs.h drivers/cdrom/isofs.c \
2.226 + drivers/cdrom/isomem.c sh4/sh4.def sh4/sh4core.in \
2.227 + sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in hotkeys.c \
2.228 + hotkeys.h $(am__append_1) $(am__append_2) $(am__append_4) \
2.229 + $(am__append_5) $(am__append_6) $(am__append_7) \
2.230 + $(am__append_8) $(am__append_9) $(am__append_10) \
2.231 + $(am__append_17) $(am__append_19) $(am__append_21) \
2.232 + $(am__append_23) $(am__append_25) $(am__append_27) \
2.233 + $(am__append_28) $(am__append_29) $(am__append_30)
2.234 lxdream_CPPFLAGS = @LXDREAMCPPFLAGS@
2.235 @BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@
2.236 @BUILD_SH4X86_TRUE@test_testsh4x86_CPPFLAGS = @LXDREAMCPPFLAGS@
2.237 @@ -1469,20 +1468,6 @@
2.238 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2.239 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-cache.obj `if test -f 'sh4/cache.c'; then $(CYGPATH_W) 'sh4/cache.c'; else $(CYGPATH_W) '$(srcdir)/sh4/cache.c'; fi`
2.240
2.241 -lxdream-shadow.o: sh4/shadow.c
2.242 -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-shadow.o -MD -MP -MF "$(DEPDIR)/lxdream-shadow.Tpo" -c -o lxdream-shadow.o `test -f 'sh4/shadow.c' || echo '$(srcdir)/'`sh4/shadow.c; \
2.243 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-shadow.Tpo" "$(DEPDIR)/lxdream-shadow.Po"; else rm -f "$(DEPDIR)/lxdream-shadow.Tpo"; exit 1; fi
2.244 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sh4/shadow.c' object='lxdream-shadow.o' libtool=no @AMDEPBACKSLASH@
2.245 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2.246 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-shadow.o `test -f 'sh4/shadow.c' || echo '$(srcdir)/'`sh4/shadow.c
2.247 -
2.248 -lxdream-shadow.obj: sh4/shadow.c
2.249 -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-shadow.obj -MD -MP -MF "$(DEPDIR)/lxdream-shadow.Tpo" -c -o lxdream-shadow.obj `if test -f 'sh4/shadow.c'; then $(CYGPATH_W) 'sh4/shadow.c'; else $(CYGPATH_W) '$(srcdir)/sh4/shadow.c'; fi`; \
2.250 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-shadow.Tpo" "$(DEPDIR)/lxdream-shadow.Po"; else rm -f "$(DEPDIR)/lxdream-shadow.Tpo"; exit 1; fi
2.251 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sh4/shadow.c' object='lxdream-shadow.obj' libtool=no @AMDEPBACKSLASH@
2.252 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2.253 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-shadow.obj `if test -f 'sh4/shadow.c'; then $(CYGPATH_W) 'sh4/shadow.c'; else $(CYGPATH_W) '$(srcdir)/sh4/shadow.c'; fi`
2.254 -
2.255 lxdream-armcore.o: aica/armcore.c
2.256 @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-armcore.o -MD -MP -MF "$(DEPDIR)/lxdream-armcore.Tpo" -c -o lxdream-armcore.o `test -f 'aica/armcore.c' || echo '$(srcdir)/'`aica/armcore.c; \
2.257 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-armcore.Tpo" "$(DEPDIR)/lxdream-armcore.Po"; else rm -f "$(DEPDIR)/lxdream-armcore.Tpo"; exit 1; fi
2.258 @@ -2183,6 +2168,20 @@
2.259 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2.260 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-mmux86.obj `if test -f 'sh4/mmux86.c'; then $(CYGPATH_W) 'sh4/mmux86.c'; else $(CYGPATH_W) '$(srcdir)/sh4/mmux86.c'; fi`
2.261
2.262 +lxdream-shadow.o: sh4/shadow.c
2.263 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-shadow.o -MD -MP -MF "$(DEPDIR)/lxdream-shadow.Tpo" -c -o lxdream-shadow.o `test -f 'sh4/shadow.c' || echo '$(srcdir)/'`sh4/shadow.c; \
2.264 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-shadow.Tpo" "$(DEPDIR)/lxdream-shadow.Po"; else rm -f "$(DEPDIR)/lxdream-shadow.Tpo"; exit 1; fi
2.265 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sh4/shadow.c' object='lxdream-shadow.o' libtool=no @AMDEPBACKSLASH@
2.266 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2.267 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-shadow.o `test -f 'sh4/shadow.c' || echo '$(srcdir)/'`sh4/shadow.c
2.268 +
2.269 +lxdream-shadow.obj: sh4/shadow.c
2.270 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-shadow.obj -MD -MP -MF "$(DEPDIR)/lxdream-shadow.Tpo" -c -o lxdream-shadow.obj `if test -f 'sh4/shadow.c'; then $(CYGPATH_W) 'sh4/shadow.c'; else $(CYGPATH_W) '$(srcdir)/sh4/shadow.c'; fi`; \
2.271 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-shadow.Tpo" "$(DEPDIR)/lxdream-shadow.Po"; else rm -f "$(DEPDIR)/lxdream-shadow.Tpo"; exit 1; fi
2.272 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sh4/shadow.c' object='lxdream-shadow.obj' libtool=no @AMDEPBACKSLASH@
2.273 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2.274 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lxdream-shadow.obj `if test -f 'sh4/shadow.c'; then $(CYGPATH_W) 'sh4/shadow.c'; else $(CYGPATH_W) '$(srcdir)/sh4/shadow.c'; fi`
2.275 +
2.276 lxdream-x86dasm.o: x86dasm/x86dasm.c
2.277 @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lxdream_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lxdream-x86dasm.o -MD -MP -MF "$(DEPDIR)/lxdream-x86dasm.Tpo" -c -o lxdream-x86dasm.o `test -f 'x86dasm/x86dasm.c' || echo '$(srcdir)/'`x86dasm/x86dasm.c; \
2.278 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/lxdream-x86dasm.Tpo" "$(DEPDIR)/lxdream-x86dasm.Po"; else rm -f "$(DEPDIR)/lxdream-x86dasm.Tpo"; exit 1; fi
3.1 --- a/src/main.c Wed Dec 21 17:13:08 2011 +1000
3.2 +++ b/src/main.c Thu Dec 22 18:10:36 2011 +1000
3.3 @@ -359,9 +359,12 @@
3.4 }
3.5
3.6 sh4_set_core( sh4_core );
3.7 +
3.8 +#ifdef SH4_TRANSLATOR
3.9 if( sh4_core == SH4_TRANSLATE ) {
3.10 sh4_translate_set_profile_blocks( sh4_profile_blocks );
3.11 }
3.12 +#endif
3.13
3.14 /* If requested, start the gdb server immediately before we go into the main
3.15 * loop.
4.1 --- a/src/sh4/shadow.c Wed Dec 21 17:13:08 2011 +1000
4.2 +++ b/src/sh4/shadow.c Thu Dec 22 18:10:36 2011 +1000
4.3 @@ -34,7 +34,7 @@
4.4 #define EXCEPTION_EXIT(exc) do{ *(((void * volatile *)__builtin_frame_address(0))+1) = exc; } while(0)
4.5 #else
4.6 #define INIT_EXCEPTIONS(label)
4.7 -#define EXCEPTION_EXIT() sh4_core_exit(CORE_EXIT_EXCEPTION)
4.8 +#define EXCEPTION_EXIT(exc) sh4_core_exit(CORE_EXIT_EXCEPTION)
4.9 #endif
4.10
4.11 typedef enum {
.