mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-03-28 05:37:37 +00:00
mainly UI updates for dspspy, make dsptool's -m flag obey the -f flag
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3856 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
5b6b732378
commit
67a083db39
@ -137,6 +137,10 @@
|
|||||||
RelativePath=".\tests\ir_test.ds"
|
RelativePath=".\tests\ir_test.ds"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath=".\tests\ld_test.ds"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\tests\mul_test.ds"
|
RelativePath=".\tests\mul_test.ds"
|
||||||
>
|
>
|
||||||
|
@ -331,13 +331,14 @@ void handle_dsp_mail(void)
|
|||||||
real_dsp.SendTask((void *)MEM_VIRTUAL_TO_PHYSICAL(dsp_code[curUcode]), 0, 4000, 0x10);
|
real_dsp.SendTask((void *)MEM_VIRTUAL_TO_PHYSICAL(dsp_code[curUcode]), 0, 4000, 0x10);
|
||||||
|
|
||||||
runningUcode = curUcode + 1;
|
runningUcode = curUcode + 1;
|
||||||
|
|
||||||
|
// Clear exception status since we've loaded a new ucode
|
||||||
|
CON_BlankRow(25);
|
||||||
}
|
}
|
||||||
else if ((mail & 0xffff0000) == 0x8bad0000)
|
else if ((mail & 0xffff0000) == 0x8bad0000)
|
||||||
{
|
{
|
||||||
// dsp_base.inc is reporting an exception happened
|
// dsp_base.inc is reporting an exception happened
|
||||||
char temp[100];
|
CON_PrintRow(4, 25, "%s caused exception %x", UCODE_NAMES[curUcode], mail & 0xff);
|
||||||
sprintf(temp, "Exception %x", mail & 0xff);
|
|
||||||
UpdateLastMessage(temp);
|
|
||||||
}
|
}
|
||||||
else if (mail == 0x8888dead)
|
else if (mail == 0x8888dead)
|
||||||
{
|
{
|
||||||
@ -387,7 +388,7 @@ void handle_dsp_mail(void)
|
|||||||
DumpDSP_ROMs(dspbufP, &dspbufP[0x1000]);
|
DumpDSP_ROMs(dspbufP, &dspbufP[0x1000]);
|
||||||
}
|
}
|
||||||
|
|
||||||
CON_Printf(2, 1, "UCode: %d/%d %s, Last mail: %08x",
|
CON_PrintRow(2, 1, "UCode: %d/%d %s, Last mail: %08x",
|
||||||
curUcode + 1, NUM_UCODES, UCODE_NAMES[curUcode], mail);
|
curUcode + 1, NUM_UCODES, UCODE_NAMES[curUcode], mail);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -207,7 +207,8 @@ irq:
|
|||||||
;sr @DMBL, $wr3 ; ???
|
;sr @DMBL, $wr3 ; ???
|
||||||
sr @DMBL, $ac0.m ; Exception number
|
sr @DMBL, $ac0.m ; Exception number
|
||||||
si @DIRQ, #0x0001
|
si @DIRQ, #0x0001
|
||||||
halt
|
halt ; Through some magic this allows us to properly ack the exception in dspspy
|
||||||
|
;rti ; allow dumping of ucodes which cause exceptions...probably not safe at all
|
||||||
|
|
||||||
; DMA:s the current state of the registers back to the PowerPC. To do this,
|
; DMA:s the current state of the registers back to the PowerPC. To do this,
|
||||||
; it must write the contents of all regs to DRAM.
|
; it must write the contents of all regs to DRAM.
|
||||||
|
@ -402,7 +402,7 @@ int main(int argc, const char *argv[])
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if(!Assemble(currentSource.c_str(), codes[i]))
|
if(!Assemble(currentSource.c_str(), codes[i], force))
|
||||||
{
|
{
|
||||||
printf("Assemble: Assembly of %s failed due to errors\n",
|
printf("Assemble: Assembly of %s failed due to errors\n",
|
||||||
files[i].c_str());
|
files[i].c_str());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user