The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-03 19:42:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed DSPTool include bugs and some leftover fixes

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3069 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY 2009-04-25 02:13:33 +00:00
parent 2402d46e62
commit a8c224023c
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DSPCore/Src/assemble.cpp
View File

@ -112,6 +112,7 @@ bool DSPAssembler::Assemble(const char *text, std::vector<u16> *code, std::vecto
last_error_str = "(no errors)"; last_error_str = "(no errors)";
last_error = ERR_OK; last_error = ERR_OK;
return true; return true;
} }
@ -742,7 +743,7 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
fseek(fsrc, 0, SEEK_SET); fseek(fsrc, 0, SEEK_SET);
printf("Pass %d\n", pass); printf("%s: Pass %d\n", fname, pass);
code_line = 0; code_line = 0;
m_cur_pass = pass; m_cur_pass = pass;
@ -765,7 +766,7 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
{ {
char c = linebuffer[i]; char c = linebuffer[i];
// This stuff handles /**/ and // comments. // This stuff handles /**/ and // comments.
// modified by Hermes : added // and /* */ for long comentaries // modified by Hermes : added // and /* */ for long commentaries
if (c == '/') if (c == '/')
{ {
if (i < 1023) if (i < 1023)
@ -892,6 +893,7 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
if (params[0].type == P_STR) if (params[0].type == P_STR)
{ {
char *tmpstr; char *tmpstr;
FILE *thisSrc = fsrc;
if (include_dir.size()) if (include_dir.size())
{ {
tmpstr = (char *)malloc(include_dir.size() + strlen(params[0].str) + 2); tmpstr = (char *)malloc(include_dir.size() + strlen(params[0].str) + 2);
@ -903,6 +905,8 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
strcpy(tmpstr, params[0].str); strcpy(tmpstr, params[0].str);
} }
AssembleFile(tmpstr, pass); AssembleFile(tmpstr, pass);
fsrc = thisSrc;
free(tmpstr); free(tmpstr);
} }
else else
@ -983,6 +987,7 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
m_cur_addr += opcode_size; m_cur_addr += opcode_size;
}; };
if (gdg_buffer == NULL) if (gdg_buffer == NULL)
{ {
gdg_buffer_size = m_cur_addr; gdg_buffer_size = m_cur_addr;

3
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -497,9 +497,10 @@ void CFrame::DoOpen(bool Boot)
void CFrame::OnChangeDisc(wxCommandEvent& WXUNUSED (event)) void CFrame::OnChangeDisc(wxCommandEvent& WXUNUSED (event))
{ {
DVDInterface::SetLidOpen(); DVDInterface::SetLidOpen(true);
DoOpen(false); DoOpen(false);
DVDInterface::SetLidOpen(false); DVDInterface::SetLidOpen(false);
DVDInterface::SetDiscInside(true);
} }
void CFrame::OnPlay(wxCommandEvent& WXUNUSED (event)) void CFrame::OnPlay(wxCommandEvent& WXUNUSED (event))

4
Source/DSPSpy/tests/dsp_base.inc
View File

@ -24,7 +24,7 @@ MEM_LO: equ 0x0f7F
sbset #0x05 sbset #0x05
sbset #0x06 sbset #0x06
set16 s16
lri $CR, #0x00ff lri $CR, #0x00ff
; Why do we have a main label here? ; Why do we have a main label here?
@ -178,7 +178,7 @@ irq4:
jmp irq jmp irq
irq5: irq5:
; No idea what this code is doing. ; No idea what this code is doing.
set16 s16
mrr $st1, $ac0.l mrr $st1, $ac0.l
mrr $st1, $ac0.m mrr $st1, $ac0.m
clr $acc0 clr $acc0

4
Source/Plugins/Plugin_Wiimote/Src/EmuSubroutines.cpp
View File

@ -84,8 +84,8 @@ void HidOutputReport(u16 _channelID, wm_report* sr) {
switch(sr->channel) switch(sr->channel)
{ {
case 0x10: case WM_RUMBLE:
ERROR_LOG(WII_IPC_WIIMOTE, "HidOutputReport: unknown sr->channel 0x10"); // TODO: Implement rumble for real wiimotes
break; break;
case WM_LEDS: // 0x11 case WM_LEDS: // 0x11
WmLeds(_channelID, (wm_leds*)sr->data); WmLeds(_channelID, (wm_leds*)sr->data);