[mupen64plus-rsp-hle] 105/167: Imported Upstream version 1.99.5+6+0d5a734e9425
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:02:29 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-rsp-hle.
commit 7c57730f39907421ab7d9c12e60e324ad5a3e6b1
Author: Sven Eckelmann <sven at narfation.org>
Date: Sat Jun 16 22:06:20 2012 +0200
Imported Upstream version 1.99.5+6+0d5a734e9425
---
projects/unix/Makefile | 8 +-
src/jpeg.c | 2 +-
src/main.c | 304 ++++++++++++++++++++++++++++++++-----------------
3 files changed, 207 insertions(+), 107 deletions(-)
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index b50545b..2c5dce8 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -142,7 +142,7 @@ ifeq ($(OS), OSX)
LDFLAGS += -arch x86_64
else
CFLAGS += -pipe -mmmx -msse -fomit-frame-pointer -arch i686 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
- LDFLAGS += -arch i686
+ LDFLAGS += -arch i686 -read_only_relocs suppress
endif
endif
endif
@@ -249,6 +249,7 @@ targets:
@echo " DESTDIR=path == path to prepend to all installation paths (only for packagers)"
@echo " Debugging Options:"
@echo " DEBUG=1 == add debugging symbols"
+ @echo " LTO=1 == enable experimental build with link-time optimization"
@echo " V=1 == show verbose compiler output"
all: $(TARGET)
@@ -270,6 +271,11 @@ CFLAGS += -MD
-include $(OBJECTS:.o=.d)
CXXFLAGS += $(CFLAGS)
+ifeq ($(LTO), 1)
+ CFLAGS += -flto
+ CXXFLAGS += -flto
+ LDFLAGS += -fuse-linker-plugin $(CXXFLAGS)
+endif
# standard build rules
$(OBJDIR)/%.o: $(SRCDIR)/%.c
diff --git a/src/jpeg.c b/src/jpeg.c
index 67f5ef4..c51e611 100644
--- a/src/jpeg.c
+++ b/src/jpeg.c
@@ -364,7 +364,7 @@ void ps_jpg_uncompress(OSTask_t *task)
}
// Texel Formatting (RGBA16)
- offset = ps_jpg_data.pMacroBlocks + oMBsize*mb;
+ offset = ps_jpg_data.pMacroBlocks + iMBsize*mb;
y_offset = 0;
u_offset = oMBsize/2;
diff --git a/src/main.c b/src/main.c
index 736310a..c72c342 100644
--- a/src/main.c
+++ b/src/main.c
@@ -42,6 +42,53 @@ static int l_PluginInit = 0;
/* local functions */
+
+static void dump_binary(char *filename, unsigned char *bytes, unsigned size)
+{
+ FILE *f;
+
+ // if file already exists, do nothing
+ f = fopen(filename, "r");
+ if (f == NULL)
+ {
+ // else we write bytes to the file
+ f= fopen(filename, "wb");
+ if (f != NULL) {
+ if (fwrite(bytes, 1, size, f) != size)
+ {
+ DebugMessage(M64MSG_ERROR, "Writing error on %s", filename);
+ }
+ fclose(f);
+ }
+ else
+ {
+ DebugMessage(M64MSG_ERROR, "Couldn't open %s for writing !", filename);
+ }
+ }
+ else
+ {
+ fclose(f);
+ }
+}
+
+
+/**
+ * Try to figure if the RSP was launched using osSpTask* functions
+ * and not run directly (in which case DMEM[0xfc0-0xfff] is meaningless).
+ *
+ * Previously, the ucode_size field was used to determine this,
+ * but it is not robust enough (hi Pokemon Stadium !) because games could write anything
+ * in this field : most ucode_boot discard the value and just use 0xf7f anyway.
+ *
+ * Using ucode_boot_size should be more robust in this regard.
+ **/
+static int is_run_through_task(OSTask_t* task)
+{
+ return (task->ucode_boot_size <= 0x1000
+ && task->ucode_boot_size >= 0);
+}
+
+
/**
* Simulate the effect of setting the TASKDONE bit (aliased to SIG2)
* and executing a break instruction (setting HALT and BROKE bits).
@@ -57,6 +104,13 @@ static void taskdone()
//
// 0x203 = TASKDONE | BROKE | HALT
*rsp.SP_STATUS_REG |= 0x203;
+
+ // if INTERRUPT_ON_BREAK we generate the interrupt
+ if ((*rsp.SP_STATUS_REG & 0x40) != 0 )
+ {
+ *rsp.MI_INTR_REG |= 0x1;
+ rsp.CheckInterrupts();
+ }
}
@@ -109,8 +163,6 @@ static int audio_ucode(OSTask_t *task)
}
}
-// data = (short*)(rsp.RDRAM + task->ucode_data);
-
for (i = 0; i < (task->data_size/4); i += 2)
{
inst1 = p_alist[i];
@@ -193,140 +245,182 @@ EXPORT m64p_error CALL PluginGetVersion(m64p_plugin_type *PluginType, int *Plugi
EXPORT unsigned int CALL DoRspCycles(unsigned int Cycles)
{
- OSTask_t *task = (OSTask_t*)(rsp.DMEM + 0xFC0);
+ OSTask_t *task = (OSTask_t*)(rsp.DMEM + 0xfc0);
+ int run_through_task = is_run_through_task(task);
+
unsigned int i, sum=0;
- if( task->type == 1 && task->data_ptr != 0 && GraphicsHle)
+ char filename[256];
+
+ if (run_through_task)
{
- if (rsp.ProcessDlistList != NULL)
+ // most ucode_boot procedure copy 0xf80 bytes of ucode whatever the ucode_size is.
+ // For practical purpose we use a ucode_size = min(0xf80, task->ucode_size)
+ unsigned int ucode_size = (task->ucode_size > 0xf80) ? 0xf80 : task->ucode_size;
+
+ for (i=0; i<ucode_size/2; i++)
+ sum += *(rsp.RDRAM + task->ucode + i);
+
+ switch(task->type)
{
- rsp.ProcessDlistList();
+ case 1: // GFX
+ {
+ if (GraphicsHle && rsp.ProcessDlistList != NULL)
+ {
+ rsp.ProcessDlistList();
+ taskdone();
+ *rsp.DPC_STATUS_REG &= ~0x0002;
+ return Cycles;
+ }
+ else
+ {
+ DebugMessage(M64MSG_WARNING, "GFX ucode through rsp plugin is not implemented");
+ }
+ break;
+ }
+
+ case 2: // AUDIO
+ {
+ if (AudioHle && rsp.ProcessAlistList != NULL)
+ {
+ rsp.ProcessAlistList();
+ taskdone();
+ return Cycles;
+ }
+ else
+ {
+ if (audio_ucode(task) == 0)
+ {
+ taskdone();
+ return Cycles;
+ }
+ }
+ break;
+ }
+
+ case 4: // JPEG
+ {
+ switch(sum)
+ {
+ case 0x278: // Zelda OOT during boot
+ taskdone();
+ return Cycles;
+ case 0x2caa6: // Zelda OOT, Pokemon Stadium {1,2} jpg decompression
+ ps_jpg_uncompress(task);
+ taskdone();
+ return Cycles;
+ case 0x130de: // Ogre Battle background decompression
+ ob_jpg_uncompress(task);
+ taskdone();
+ return Cycles;
+ }
+ break;
+ }
+
+ case 7: // CFB
+ {
+ rsp.ShowCFB();
+ taskdone();
+ return Cycles;
+ break;
+ }
}
- taskdone();
- if ((*rsp.SP_STATUS_REG & 0x40) != 0 )
+
+ DebugMessage(M64MSG_WARNING, "unknown OSTask: sum %x PC:%x", sum, *rsp.SP_PC_REG);
+
+ sprintf(&filename[0], "task_%x.log", sum);
+
+
+ // dump task
+ FILE *f = fopen(filename, "r");
+ if (f == NULL)
{
- *rsp.MI_INTR_REG |= 0x1;
- rsp.CheckInterrupts();
+ f = fopen(filename, "w");
+ fprintf(f,
+ "type = %d\n"
+ "flags = %d\n"
+ "ucode_boot = %#08x size = %#x\n"
+ "ucode = %#08x size = %#x\n"
+ "ucode_data = %#08x size = %#x\n"
+ "dram_stack = %#08x size = %#x\n"
+ "output_buff = %#08x *size = %#x\n"
+ "data = %#08x size = %#x\n"
+ "yield_data = %#08x size = %#x\n",
+ task->type, task->flags,
+ task->ucode_boot, task->ucode_boot_size,
+ task->ucode, task->ucode_size,
+ task->ucode_data, task->ucode_data_size,
+ task->dram_stack, task->dram_stack_size,
+ task->output_buff, task->output_buff_size,
+ task->data_ptr, task->data_size,
+ task->yield_data_ptr, task->yield_data_size);
+ fclose(f);
+ }
+ else
+ {
+ fclose(f);
}
- *rsp.DPC_STATUS_REG &= ~0x0002;
- return Cycles;
- }
- else if (task->type == 2 && AudioHle)
- {
- if (rsp.ProcessAlistList != NULL)
+
+ // dump ucode_boot
+ sprintf(&filename[0], "ucode_boot_%x.bin", sum);
+ dump_binary(filename, rsp.RDRAM + (task->ucode_boot & 0x7fffff), task->ucode_boot_size);
+
+ // dump ucode
+ if (task->ucode != 0)
{
- rsp.ProcessAlistList();
+ sprintf(&filename[0], "ucode_%x.bin", sum);
+ dump_binary(filename, rsp.RDRAM + (task->ucode & 0x7fffff), ucode_size);
}
- taskdone();
- if ((*rsp.SP_STATUS_REG & 0x40) != 0 )
+
+ // dump ucode_data
+ if (task->ucode_data != 0)
{
- *rsp.MI_INTR_REG |= 0x1;
- rsp.CheckInterrupts();
+ sprintf(&filename[0], "ucode_data_%x.bin", sum);
+ dump_binary(filename, rsp.RDRAM + (task->ucode_data & 0x7fffff), task->ucode_data_size);
}
- return Cycles;
- }
- else if (task->type == 7)
- {
- rsp.ShowCFB();
- }
- taskdone();
- if ((*rsp.SP_STATUS_REG & 0x40) != 0 )
- {
- *rsp.MI_INTR_REG |= 0x1;
- rsp.CheckInterrupts();
+ // dump data
+ if (task->data_ptr != 0)
+ {
+ sprintf(&filename[0], "data_%x.bin", sum);
+ dump_binary(filename, rsp.RDRAM + (task->data_ptr & 0x7fffff), task->data_size);
+ }
}
-
- if (task->ucode_size <= 0x1000)
- for (i=0; i<(task->ucode_size/2); i++)
- sum += *(rsp.RDRAM + task->ucode + i);
else
+ {
+ // For ucodes that are not run using the osSpTask* functions
+
+ // Try to identify the RSP code we should run
for (i=0; i<(0x1000/2); i++)
sum += *(rsp.IMEM + i);
-
- if (task->ucode_size > 0x1000)
- {
switch(sum)
{
- case 0x9E2: // banjo tooie (U) boot code
- {
- int i,j;
- memcpy(rsp.IMEM + 0x120, rsp.RDRAM + 0x1e8, 0x1e8);
- for (j=0; j<0xfc; j++)
- for (i=0; i<8; i++)
- *(rsp.RDRAM+((0x2fb1f0+j*0xff0+i)^S8))=*(rsp.IMEM+((0x120+j*8+i)^S8));
- }
- return Cycles;
- case 0x9F2: // banjo tooie (E) + zelda oot (E) boot code
+ // CIC 6105 IPL3 run some code on the RSP
+ // We only emulate the part that modify RDRAM
+ //
+ // It is used for instance in Banjo Tooie, Zelda, Perfect Dark...
+ case 0x9E2: // banjo tooie (U)
+ case 0x9F2: // banjo tooie (E)
{
int i,j;
- memcpy(rsp.IMEM + 0x120, rsp.RDRAM + 0x1e8, 0x1e8);
+ memcpy(rsp.IMEM + 0x120, rsp.RDRAM + 0x1e8, 0x1f0);
for (j=0; j<0xfc; j++)
for (i=0; i<8; i++)
*(rsp.RDRAM+((0x2fb1f0+j*0xff0+i)^S8))=*(rsp.IMEM+((0x120+j*8+i)^S8));
- }
return Cycles;
- }
- }
- else
- {
- switch(task->type)
- {
- case 2: // audio
- if (audio_ucode(task) == 0)
- return Cycles;
- break;
- case 4: // jpeg
- switch(sum)
- {
- case 0x278: // used by zelda during boot
- taskdone();
- return Cycles;
- case 0x2e4fc: // used by pokemon stadium {1,2} for jpg decompression
- ps_jpg_uncompress(task);
- taskdone();
- return Cycles;
- case 0x130de: // used by ogre battle for background decompression
- ob_jpg_uncompress(task);
- taskdone();
- return Cycles;
- default:
- DebugMessage(M64MSG_WARNING, "unknown jpeg task: sum:%x", sum);
}
- break;
}
- }
- {
- FILE *f;
- DebugMessage(M64MSG_WARNING, "unknown task: type:%d sum:%x PC:%lx", (int)task->type, sum, (unsigned long) rsp.SP_PC_REG);
-
- if (task->ucode_size <= 0x1000)
- {
- f = fopen("imem.dat", "wb");
- if (f == NULL || fwrite(rsp.RDRAM + task->ucode, 1, task->ucode_size, f) != task->ucode_size)
- DebugMessage(M64MSG_WARNING, "couldn't write to RSP debugging file imem.dat");
- fclose(f);
+ DebugMessage(M64MSG_WARNING, "unknown RSP code: sum: %x PC:%x", sum, *rsp.SP_PC_REG);
- f = fopen("dmem.dat", "wb");
- if (f == NULL || fwrite(rsp.RDRAM + task->ucode_data, 1, task->ucode_data_size, f) != task->ucode_data_size)
- DebugMessage(M64MSG_WARNING, "couldn't write to RSP debugging file dmem.dat");
- fclose(f);
- }
- else
- {
- f = fopen("imem.dat", "wb");
- if (f == NULL || fwrite(rsp.IMEM, 1, 0x1000, f) != 0x1000)
- DebugMessage(M64MSG_WARNING, "couldn't write to RSP debugging file imem.dat");
- fclose(f);
+ // dump IMEM & DMEM for further analysis
+ sprintf(&filename[0], "imem_%x.bin", sum);
+ dump_binary(filename, rsp.IMEM, 0x1000);
- f = fopen("dmem.dat", "wb");
- if (f == NULL || fwrite(rsp.DMEM, 1, 0x1000, f) != 0x1000)
- DebugMessage(M64MSG_WARNING, "couldn't write to RSP debugging file dmem.dat");
- fclose(f);
- }
+ sprintf(&filename[0], "dmem_%x.bin", sum);
+ dump_binary(filename, rsp.DMEM, 0x1000);
}
return Cycles;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-rsp-hle.git
More information about the Pkg-games-commits
mailing list