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

Fixed segfault where output from DiStella::disasm wasn't being parsed 

correctly.  Disabled built-in functions until I get to that area of
code, since I'm tired of seeing an error message every time I test
new changes.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1962 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2010-02-27 23:21:14 +00:00
parent 8b22097cb6
commit 0c6f564fa8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/debugger/Debugger.cxx
View File

@ -337,6 +337,7 @@ void Debugger::autoExec()
myPrompt->print("autoExec():\n" + myParser->exec(file) + "\n"); myPrompt->print("autoExec():\n" + myParser->exec(file) + "\n");
myPrompt->printPrompt(); myPrompt->printPrompt();
/* FIXME - get these working again
// Init builtins // Init builtins
for(int i = 0; builtin_functions[i][0] != ""; i++) for(int i = 0; builtin_functions[i][0] != ""; i++)
{ {
@ -346,6 +347,7 @@ void Debugger::autoExec()
Expression* exp = YaccParser::getResult(); Expression* exp = YaccParser::getResult();
addFunction(builtin_functions[i][0], builtin_functions[i][1], exp, true); addFunction(builtin_functions[i][0], builtin_functions[i][1], exp, true);
} }
*/
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/debugger/DiStella.cxx
View File

@ -146,7 +146,7 @@ void DiStella::disasm(CartDebug::DisassemblyList& list, uInt32 distart, int pass
if (pass == 3) if (pass == 3)
{ {
bytes = 1; bytes = 1;
myBuf << HEX4 << myPC+myOffset << "'L" << myPC+myOffset << "'.byte " myBuf << HEX4 << myPC+myOffset << "'L" << HEX4 << myPC+myOffset << "'.byte "
<< "$" << HEX2 << (int)Debugger::debugger().peek(myPC+myOffset); << "$" << HEX2 << (int)Debugger::debugger().peek(myPC+myOffset);
} }
myPC++; myPC++;