ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge in b3153dcf breaking build. 

The merge conflict was resolved incorrectly, replace with source file
from the libretro fork.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2021-10-20 13:08:38 +00:00
parent 3f571fb930
commit c37c472996
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gba/agbprint.cpp
View File

@ -55,10 +55,6 @@ void agbPrintFlush()
uint16_t put = debuggerReadHalfWord(0x9fe20fe); uint16_t put = debuggerReadHalfWord(0x9fe20fe);
uint32_t address = (debuggerReadHalfWord(0x9fe20fa) << 16); uint32_t address = (debuggerReadHalfWord(0x9fe20fa) << 16);
char message[0x10000];
size_t index = 0;
if (address != 0xfd0000 && address != 0x1fd0000) { if (address != 0xfd0000 && address != 0x1fd0000) {
#ifdef BKPT_SUPPORT #ifdef BKPT_SUPPORT
dbgOutput("Did you forget to call AGBPrintInit?\n", 0); dbgOutput("Did you forget to call AGBPrintInit?\n", 0);
@ -77,18 +73,10 @@ void agbPrintFlush()
s[0] = c; s[0] = c;
s[1] = 0; s[1] = 0;
if (systemVerbose & VERBOSE_AGBPRINT) if (systemVerbose & VERBOSE_AGBPRINT)
{
#ifdef BKPT_SUPPORT
dbgOutput(s, 0); dbgOutput(s, 0);
#endif #endif
if (c == '\n') if (c == '\n')
break; break;
} }
message[index] = '\0';
if (systemVerbose & VERBOSE_AGBPRINT)
{
log("AGBPrint: %s\n", message);
}
debuggerWriteHalfWord(0x9fe20fc, get); debuggerWriteHalfWord(0x9fe20fc, get);
} }