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

o add custom chip for mmio

Browse Source
This commit is contained in:
David Voswinkel 2009-05-17 08:48:44 -07:00
parent c66828729f
commit 1075795ef4
12 changed files with 541 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
snes/mmio/Makefile
View File

@ -1,9 +1,9 @@
# SDK Config # SDK Config
PLATFORM=mac PLATFORM=$(shell uname)
ifeq ($(PLATFORM),linux) ifeq ($(PLATFORM),Linux)
# Linux Wine # Linux Wine
SDK=/home/david/.wine/drive_c/65xx_FreeSDK SDK=/home/david/.wine/drive_c/65xx_FreeSDK
WINE=wine WINE=wine

13
snes/mmio/main.c
View File

@ -29,10 +29,8 @@ void main(void) {
word crc01; word crc01;
word crc02; word crc02;
padStatus pad1; padStatus pad1;
char line_header[32] = "BANK CRC ADDR 123456789ABCDEF"; char line_header[32] = "OK";
char line[32] = " "; char packet[4] = "TEST";
char test_buffer[] = "da";
unsigned long addr;
initInternalRegisters(); initInternalRegisters();
*(byte*) 0x2105 = 0x01; // MODE 1 value *(byte*) 0x2105 = 0x01; // MODE 1 value
@ -41,9 +39,14 @@ void main(void) {
*(byte*) 0x2100 = 0x0f; // enable background *(byte*) 0x2100 = 0x0f; // enable background
enableDebugScreen(); enableDebugScreen();
writeln(line_header,0); writeln(line_header,0);
for (i=0;i<4;i++){
*(byte*) 0x3000=packet[i];
*(byte*) 0x700010=packet[i];
}
//writeln(line_header,1);
while(1){ while(1){
while(!pad1.start) { while(!pad1.start) {
waitForVBlank(); waitForVBlank();

222
snesram.tmproj
View File

@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>currentDocument</key> <key>currentDocument</key>
<string>tools/bsnes/memory/memory.cpp</string> <string>tools/bsnes/ppu/bppu/bppu_mmio.cpp</string>
<key>documents</key> <key>documents</key>
<array> <array>
<dict> <dict>
@ -18,7 +18,7 @@
</dict> </dict>
</array> </array>
<key>fileHierarchyDrawerWidth</key> <key>fileHierarchyDrawerWidth</key>
<integer>200</integer> <integer>271</integer>
<key>metaData</key> <key>metaData</key>
<dict> <dict>
<key>poc/avr_sdcard/fat.h</key> <key>poc/avr_sdcard/fat.h</key>
@ -105,6 +105,62 @@
<key>firstVisibleLine</key> <key>firstVisibleLine</key>
<integer>43</integer> <integer>43</integer>
</dict> </dict>
<key>snes/mmio/data.h</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>snes/mmio/debug.c</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>4</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>snes/mmio/debug.h</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>10</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>snes/mmio/main.c</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>7</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>5</integer>
</dict>
<key>tools/bsnes/cart/cart.cpp</key> <key>tools/bsnes/cart/cart.cpp</key>
<dict> <dict>
<key>caret</key> <key>caret</key>
@ -133,12 +189,40 @@
<key>firstVisibleLine</key> <key>firstVisibleLine</key>
<integer>24</integer> <integer>24</integer>
</dict> </dict>
<key>tools/bsnes/cc.sh</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/memory/memory.cpp</key> <key>tools/bsnes/memory/memory.cpp</key>
<dict> <dict>
<key>caret</key> <key>caret</key>
<dict> <dict>
<key>column</key> <key>column</key>
<integer>22</integer> <integer>4</integer>
<key>line</key>
<integer>37</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>4</integer>
</dict>
<key>tools/bsnes/memory/memory.hpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key> <key>line</key>
<integer>0</integer> <integer>0</integer>
</dict> </dict>
@ -203,10 +287,107 @@
<key>firstVisibleLine</key> <key>firstVisibleLine</key>
<integer>0</integer> <integer>0</integer>
</dict> </dict>
<key>tools/bsnes/ppu/bppu/bppu.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>67</integer>
</dict>
<key>tools/bsnes/ppu/bppu/bppu.hpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>13</integer>
<key>line</key>
<integer>166</integer>
</dict>
<key>columnSelection</key>
<false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>134</integer>
<key>selectFrom</key>
<dict>
<key>column</key>
<integer>9</integer>
<key>line</key>
<integer>166</integer>
</dict>
<key>selectTo</key>
<dict>
<key>column</key>
<integer>13</integer>
<key>line</key>
<integer>166</integer>
</dict>
</dict>
<key>tools/bsnes/ppu/bppu/bppu_mmio.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>220</integer>
</dict>
<key>tools/bsnes/ppu/bppu/bppu_render_mode7.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>32</integer>
<key>line</key>
<integer>33</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/ppu/ppu.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
</dict> </dict>
<key>openDocuments</key> <key>openDocuments</key>
<array> <array>
<string>tools/bsnes/memory/memory.cpp</string> <string>tools/bsnes/memory/memory.cpp</string>
<string>tools/bsnes/ppu/ppu.cpp</string>
<string>tools/bsnes/ppu/bppu/bppu.cpp</string>
<string>tools/bsnes/ppu/bppu/bppu_mmio.cpp</string>
<string>tools/bsnes/ppu/bppu/bppu.hpp</string>
<string>tools/bsnes/ppu/bppu/bppu_render_mode7.cpp</string>
<string>tools/bsnes/cc.sh</string>
<string>snes/mmio/main.c</string>
<string>snes/mmio/data.h</string>
<string>snes/mmio/debug.h</string>
<string>snes/mmio/debug.c</string>
<string>tools/bsnes/memory/memory.hpp</string>
</array> </array>
<key>showFileHierarchyDrawer</key> <key>showFileHierarchyDrawer</key>
<false/> <false/>
@ -220,7 +401,7 @@
<true/> <true/>
<key>subItems</key> <key>subItems</key>
<dict> <dict>
<key>scripts</key> <key>snes</key>
<dict> <dict>
<key>isExpanded</key> <key>isExpanded</key>
<true/> <true/>
@ -240,28 +421,12 @@
<key>subItems</key> <key>subItems</key>
<dict> <dict>
<key>lib</key> <key>lib</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict>
<key>ruby</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict>
<key>video</key>
<dict> <dict>
<key>isExpanded</key> <key>isExpanded</key>
<true/> <true/>
<key>subItems</key> <key>subItems</key>
<dict/> <dict/>
</dict> </dict>
</dict>
</dict>
</dict>
</dict>
<key>memory</key> <key>memory</key>
<dict> <dict>
<key>isExpanded</key> <key>isExpanded</key>
@ -269,6 +434,21 @@
<key>subItems</key> <key>subItems</key>
<dict/> <dict/>
</dict> </dict>
<key>ppu</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict>
<key>bppu</key>
<dict>
<key>isExpanded</key>
<true/>
<key>subItems</key>
<dict/>
</dict>
</dict>
</dict>
<key>ui_qt</key> <key>ui_qt</key>
<dict> <dict>
<key>isExpanded</key> <key>isExpanded</key>
@ -284,6 +464,6 @@
</dict> </dict>
</dict> </dict>
<key>windowFrame</key> <key>windowFrame</key>
<string>{{0, 60}, {720, 818}}</string> <string>{{0, 58}, {720, 820}}</string>
</dict> </dict>
</plist> </plist>

4
tools/bsnes/Makefile
View File

@ -126,7 +126,7 @@ link += $(if $(findstring input.rawinput,$(ruby)),$(call mklib,xinput) $(call mk
objects = libco ruby libfilter string \ objects = libco ruby libfilter string \
reader cart cheat \ reader cart cheat \
memory smemory cpu scpu smp ssmp sdsp ppu bppu snes \ memory smemory cpu scpu smp ssmp sdsp ppu bppu snes \
bsx srtc sdd1 spc7110 cx4 dsp1 dsp2 dsp3 dsp4 obc1 st010 bsx srtc sdd1 spc7110 cx4 dsp1 dsp2 dsp3 dsp4 obc1 st010 cmmio
ifeq ($(enable_gzip),true) ifeq ($(enable_gzip),true)
#objects += adler32 compress crc32 deflate gzio inffast inflate inftrees ioapi trees unzip zip zutil #objects += adler32 compress crc32 deflate gzio inffast inflate inftrees ioapi trees unzip zip zutil
@ -236,6 +236,8 @@ obj/dsp3.$(obj) : chip/dsp3/dsp3.cpp chip/dsp3/*
obj/dsp4.$(obj) : chip/dsp4/dsp4.cpp chip/dsp4/* obj/dsp4.$(obj) : chip/dsp4/dsp4.cpp chip/dsp4/*
obj/obc1.$(obj) : chip/obc1/obc1.cpp chip/obc1/* obj/obc1.$(obj) : chip/obc1/obc1.cpp chip/obc1/*
obj/st010.$(obj) : chip/st010/st010.cpp chip/st010/* obj/st010.$(obj) : chip/st010/st010.cpp chip/st010/*
obj/cmmio.$(obj) : chip/cmmio/cmmio.cpp chip/cmmio/*
############ ############
### zlib ### ### zlib ###

1
tools/bsnes/chip/chip.hpp
View File

@ -9,3 +9,4 @@
#include "dsp4/dsp4.hpp" #include "dsp4/dsp4.hpp"
#include "obc1/obc1.hpp" #include "obc1/obc1.hpp"
#include "st010/st010.hpp" #include "st010/st010.hpp"
#include "cmmio/cmmio.hpp"

35
tools/bsnes/chip/cmmio/cmmio.cpp Normal file
View File

@ -0,0 +1,35 @@
#include <../base.hpp>
#include <../cart/cart.hpp>
#include "cmmio.hpp"
void CMMIO::init() {
}
void CMMIO::enable() {
memory::mmio.map(0x3000, *this);
memory::mmio.map(0x3001, *this);
memory::mmio.map(0x3002, *this);
memory::mmio.map(0x3004, *this);
}
void CMMIO::power() {
reset();
}
void CMMIO::reset() {
}
uint8 CMMIO::mmio_read(unsigned addr) {
addr &= 0xffff;
printf("CMMIO::mmio_read 0x%x",addr);
return cpu.regs.mdr;
}
void CMMIO::mmio_write(unsigned addr, uint8 data) {
addr &= 0xffff;
printf("CMMIO::mmio_write 0x%x 0x%x",addr,data);
}
CMMIO::CMMIO() {
}

16
tools/bsnes/chip/cmmio/cmmio.hpp Normal file
View File

@ -0,0 +1,16 @@
class CMMIO : public MMIO {
public:
void init();
void enable();
void power();
void reset();
uint8 mmio_read (unsigned addr);
void mmio_write(unsigned addr, uint8 data);
CMMIO();
};
extern CMMIO cmmio;

8
tools/bsnes/cpu/scpu/mmio/mmio.cpp
View File

@ -483,6 +483,14 @@ void sCPU::mmio_write(unsigned addr, uint8 data) {
port_write(addr & 3, data); port_write(addr & 3, data);
return; return;
} }
printf("sCPU::mmio_write 0x%x 0x%x",addr,data);
/*custom area*/
if((addr & 0xff00) == 0x3000) { //$3000-$30ff
printf("sCPU::mmio_write 0x%x 0x%x",addr,data);
return;
}
//DMA //DMA
if((addr & 0xff80) == 0x4300) { //$4300-$437f if((addr & 0xff80) == 0x4300) { //$4300-$437f

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

@ -14,12 +14,18 @@ namespace memory {
}; };
uint8 UnmappedMemory::read(unsigned) { return cpu.regs.mdr; } uint8 UnmappedMemory::read(unsigned) { return cpu.regs.mdr; }
void UnmappedMemory::write(unsigned, uint8) {} void UnmappedMemory::write(unsigned addr, uint8 val) {
printf("UnmappedMemory::write 0x%x 0x%x\n",addr,val);
}
uint8 UnmappedMMIO::mmio_read(unsigned) { return cpu.regs.mdr; } uint8 UnmappedMMIO::mmio_read(unsigned) { return cpu.regs.mdr; }
void UnmappedMMIO::mmio_write(unsigned, uint8) {} void UnmappedMMIO::mmio_write(unsigned addr, uint8 val) {
printf("UnmappedMemory::write 0x%x 0x%x\n",addr,val);
}
void MMIOAccess::map(unsigned addr, MMIO &access) { void MMIOAccess::map(unsigned addr, MMIO &access) {
//printf("MMIOAccess::map 0x%x\n",addr);
//MMIO: $[00-3f]:[2000-5fff] //MMIO: $[00-3f]:[2000-5fff]
mmio[(addr - 0x2000) & 0x3fff] = &access; mmio[(addr - 0x2000) & 0x3fff] = &access;
} }
@ -34,7 +40,8 @@ uint8 MMIOAccess::read(unsigned addr) {
} }
void MMIOAccess::write(unsigned addr, uint8 data) { void MMIOAccess::write(unsigned addr, uint8 data) {
//printf("MMIOAccess::write 0x%x %x\n",addr,data);
printf("MMIOAccess::write 0x%x %x\n",addr,data);
mmio[(addr - 0x2000) & 0x3fff]->mmio_write(addr, data); mmio[(addr - 0x2000) & 0x3fff]->mmio_write(addr, data);
} }

4
tools/bsnes/memory/smemory/mapper/system.cpp
View File

@ -12,6 +12,10 @@ void sBus::map_system() {
map(MapDirect, 0x00, 0x3f, 0x2000, 0x5fff, memory::mmio); map(MapDirect, 0x00, 0x3f, 0x2000, 0x5fff, memory::mmio);
map(MapDirect, 0x80, 0xbf, 0x2000, 0x5fff, memory::mmio); map(MapDirect, 0x80, 0xbf, 0x2000, 0x5fff, memory::mmio);
map(MapDirect, 0x80, 0xbf, 0x2000, 0x5fff, memory::mmio);
/* custom memmap */
map(MapDirect, 0x70, 0x7f, 0x0000, 0x01ff, memory::mmio);
map(MapLinear, 0x00, 0x3f, 0x0000, 0x1fff, memory::wram, 0x000000, 0x002000); map(MapLinear, 0x00, 0x3f, 0x0000, 0x1fff, memory::wram, 0x000000, 0x002000);
map(MapLinear, 0x80, 0xbf, 0x0000, 0x1fff, memory::wram, 0x000000, 0x002000); map(MapLinear, 0x80, 0xbf, 0x0000, 0x1fff, memory::wram, 0x000000, 0x002000);

7
tools/bsnes/snes/snes.cpp
View File

@ -23,7 +23,7 @@ DSP3 dsp3;
DSP4 dsp4; DSP4 dsp4;
OBC1 obc1; OBC1 obc1;
ST010 st010; ST010 st010;
CMMIO cmmio;
#include "scheduler/scheduler.cpp" #include "scheduler/scheduler.cpp"
#include "tracer/tracer.cpp" #include "tracer/tracer.cpp"
@ -56,6 +56,7 @@ void SNES::init() {
video.init(); video.init();
audio.init(); audio.init();
input.init(); input.init();
cmmio.init();
snesinterface.init(); snesinterface.init();
} }
@ -95,6 +96,8 @@ void SNES::power() {
if(cartridge.has_obc1()) obc1.power(); if(cartridge.has_obc1()) obc1.power();
if(cartridge.has_st010()) st010.power(); if(cartridge.has_st010()) st010.power();
cmmio.power();
for(unsigned i = 0x2100; i <= 0x213f; i++) memory::mmio.map(i, ppu); for(unsigned i = 0x2100; i <= 0x213f; i++) memory::mmio.map(i, ppu);
for(unsigned i = 0x2140; i <= 0x217f; i++) memory::mmio.map(i, cpu); for(unsigned i = 0x2140; i <= 0x217f; i++) memory::mmio.map(i, cpu);
for(unsigned i = 0x2180; i <= 0x2183; i++) memory::mmio.map(i, cpu); for(unsigned i = 0x2180; i <= 0x2183; i++) memory::mmio.map(i, cpu);
@ -117,6 +120,8 @@ void SNES::power() {
if(cartridge.has_obc1()) obc1.enable(); if(cartridge.has_obc1()) obc1.enable();
if(cartridge.has_st010()) st010.enable(); if(cartridge.has_st010()) st010.enable();
cmmio.enable();
input.port_set_device(0, snes.config.controller_port1); input.port_set_device(0, snes.config.controller_port1);
input.port_set_device(1, snes.config.controller_port2); input.port_set_device(1, snes.config.controller_port2);
input.update(); input.update();