godzil/quickdev16
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

o add snes mmio test

Browse Source
This commit is contained in:
David Voswinkel
2009-05-16 18:39:27 +02:00
parent 46a566ce14
commit c66828729f
26 changed files with 842 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tools/bsnes/Makefile
View File

@@ -4,9 +4,9 @@ ui = ui_qt
################
### compiler ###
################
##########:######
platform=mac
platform=x
compiler=gcc
enable_gzip=false
@@ -104,20 +104,20 @@ endif
############
rubyflags = $(if $(findstring .sdl,$(ruby)),`sdl-config --cflags`)
#link += $(if $(findstring .sdl,$(ruby)),`sdl-config --libs`)
link += $(if $(findstring .sdl,$(ruby)),`sdl-config --libs`)
#link += $(if $(findstring video.direct3d,$(ruby)),$(call mklib,d3d9))
#link += $(if $(findstring video.directdraw,$(ruby)),$(call mklib,ddraw))
#link += $(if $(findstring video.glx,$(ruby)),$(call mklib,GL))
#link += $(if $(findstring video.wgl,$(ruby)),$(call mklib,opengl32))
#link += $(if $(findstring video.xv,$(ruby)),$(call mklib,Xv))
#link += $(if $(findstring audio.alsa,$(ruby)),$(call mklib,asound))
#link += $(if $(findstring audio.ao,$(ruby)),$(call mklib,ao))
#link += $(if $(findstring audio.directsound,$(ruby)),$(call mklib,dsound))
#link += $(if $(findstring audio.openal,$(ruby)),$(if $(call streq,$(platform),x),$(call mklib,openal),$(call mklib,openal32)))
#link += $(if $(findstring audio.pulseaudio,$(ruby)),$(call mklib,pulse-simple))
#link += $(if $(findstring input.directinput,$(ruby)),$(call mklib,dinput8) $(call mklib,dxguid))
#link += $(if $(findstring input.rawinput,$(ruby)),$(call mklib,xinput) $(call mklib,dinput8) $(call mklib,dxguid))
link += $(if $(findstring video.direct3d,$(ruby)),$(call mklib,d3d9))
link += $(if $(findstring video.directdraw,$(ruby)),$(call mklib,ddraw))
link += $(if $(findstring video.glx,$(ruby)),$(call mklib,GL))
link += $(if $(findstring video.wgl,$(ruby)),$(call mklib,opengl32))
link += $(if $(findstring video.xv,$(ruby)),$(call mklib,Xv))
link += $(if $(findstring audio.alsa,$(ruby)),$(call mklib,asound))
link += $(if $(findstring audio.ao,$(ruby)),$(call mklib,ao))
link += $(if $(findstring audio.directsound,$(ruby)),$(call mklib,dsound))
link += $(if $(findstring audio.openal,$(ruby)),$(if $(call streq,$(platform),x),$(call mklib,openal),$(call mklib,openal32)))
link += $(if $(findstring audio.pulseaudio,$(ruby)),$(call mklib,pulse-simple))
link += $(if $(findstring input.directinput,$(ruby)),$(call mklib,dinput8) $(call mklib,dxguid))
link += $(if $(findstring input.rawinput,$(ruby)),$(call mklib,xinput) $(call mklib,dinput8) $(call mklib,dxguid))
####################
### core objects ###

9
tools/bsnes/memory/memory.cpp
View File

@@ -29,14 +29,13 @@ MMIO* MMIOAccess::get(unsigned addr) {
}
uint8 MMIOAccess::read(unsigned addr) {
printf("MMIOAccess::read 0x%x\n",addr);
return mmio[(addr - 0x2000) & 0x3fff]->mmio_read(addr);
//printf("MMIOAccess::read 0x%x\n",addr);
return mmio[(addr - 0x2000) & 0x3fff]->mmio_read(addr);
}
void MMIOAccess::write(unsigned addr, uint8 data) {
printf("MMIOAccess::write 0x%x %x\n",addr,data);
mmio[(addr - 0x2000) & 0x3fff]->mmio_write(addr, data);
//printf("MMIOAccess::write 0x%x %x\n",addr,data);
mmio[(addr - 0x2000) & 0x3fff]->mmio_write(addr, data);
}
unsigned Bus::mirror(unsigned addr, unsigned size) {