[Scummvm-cvs-logs] scummvm master -> 4296ac6d15e163b0c6b4fff5665e7add444ba310
wjp
wjp at usecode.org
Sun Jun 12 02:02:09 CEST 2011
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
50176e7c5f SCI: Add saved_bits/show_saved_bits console commands
4296ac6d15 SCI: Fix sign in disasm of relative jumps
Commit: 50176e7c5fca547c3a1e3043d04091484b979f31
https://github.com/scummvm/scummvm/commit/50176e7c5fca547c3a1e3043d04091484b979f31
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-06-11T16:55:30-07:00
Commit Message:
SCI: Add saved_bits/show_saved_bits console commands
Changed paths:
engines/sci/console.cpp
engines/sci/console.h
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index af94524..55e820a 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -131,6 +131,8 @@ Console::Console(SciEngine *engine) : GUI::Debugger(),
DCmd_Register("al", WRAP_METHOD(Console, cmdAnimateList)); // alias
DCmd_Register("window_list", WRAP_METHOD(Console, cmdWindowList));
DCmd_Register("wl", WRAP_METHOD(Console, cmdWindowList)); // alias
+ DCmd_Register("saved_bits", WRAP_METHOD(Console, cmdSavedBits));
+ DCmd_Register("show_saved_bits", WRAP_METHOD(Console, cmdShowSavedBits));
// Segments
DCmd_Register("segment_table", WRAP_METHOD(Console, cmdPrintSegmentTable));
DCmd_Register("segtable", WRAP_METHOD(Console, cmdPrintSegmentTable)); // alias
@@ -364,6 +366,8 @@ bool Console::cmdHelp(int argc, const char **argv) {
DebugPrintf(" undither - Enable/disable undithering\n");
DebugPrintf(" play_video - Plays a SEQ, AVI, VMD, RBT or DUK video\n");
DebugPrintf(" animate_object_list / al - Shows the current list of objects in kAnimate's draw list\n");
+ DebugPrintf(" saved_bits - List saved bits on the hunk\n");
+ DebugPrintf(" show_saved_bits - Display saved bits\n");
DebugPrintf("\n");
DebugPrintf("Segments:\n");
DebugPrintf(" segment_table / segtable - Lists all segments\n");
@@ -1600,6 +1604,163 @@ bool Console::cmdWindowList(int argc, const char **argv) {
return true;
}
+
+bool Console::cmdSavedBits(int argc, const char **argv) {
+ SegManager *segman = _engine->_gamestate->_segMan;
+ SegmentId id = segman->findSegmentByType(SEG_TYPE_HUNK);
+ HunkTable* hunks = (HunkTable*)segman->getSegmentObj(id);
+ if (!hunks) {
+ DebugPrintf("No hunk segment found.\n");
+ return true;
+ }
+
+ Common::Array<reg_t> entries = hunks->listAllDeallocatable(id);
+
+ for (uint i = 0; i < entries.size(); ++i) {
+ uint16 offset = entries[i].offset;
+ const Hunk& h = hunks->_table[offset];
+ if (strcmp(h.type, "SaveBits()") == 0) {
+ byte* memoryPtr = (byte*)h.mem;
+
+ if (memoryPtr) {
+ DebugPrintf("%04x:%04x:", PRINT_REG(entries[i]));
+
+ Common::Rect rect;
+ byte mask;
+ assert(h.size >= sizeof(rect) + sizeof(mask));
+
+ memcpy((void *)&rect, memoryPtr, sizeof(rect));
+ memcpy((void *)&mask, memoryPtr + sizeof(rect), sizeof(mask));
+
+ DebugPrintf(" %d,%d - %d,%d", rect.top, rect.left,
+ rect.bottom, rect.right);
+ if (mask & GFX_SCREEN_MASK_VISUAL)
+ DebugPrintf(" visual");
+ if (mask & GFX_SCREEN_MASK_PRIORITY)
+ DebugPrintf(" priority");
+ if (mask & GFX_SCREEN_MASK_CONTROL)
+ DebugPrintf(" control");
+ if (mask & GFX_SCREEN_MASK_DISPLAY)
+ DebugPrintf(" display");
+ DebugPrintf("\n");
+ }
+ }
+ }
+
+
+ return true;
+}
+
+bool Console::cmdShowSavedBits(int argc, const char **argv) {
+ if (argc < 2) {
+ DebugPrintf("Display saved bits.\n");
+ DebugPrintf("Usage: %s <address>\n", argv[0]);
+ DebugPrintf("Check the \"addresses\" command on how to use addresses\n");
+ return true;
+ }
+
+ reg_t memoryHandle = NULL_REG;
+
+ if (parse_reg_t(_engine->_gamestate, argv[1], &memoryHandle, false)) {
+ DebugPrintf("Invalid address passed.\n");
+ DebugPrintf("Check the \"addresses\" command on how to use addresses\n");
+ return true;
+ }
+
+ if (memoryHandle.isNull()) {
+ DebugPrintf("Invalid address.\n");
+ return true;
+ }
+
+ SegManager *segman = _engine->_gamestate->_segMan;
+ SegmentId id = segman->findSegmentByType(SEG_TYPE_HUNK);
+ HunkTable* hunks = (HunkTable*)segman->getSegmentObj(id);
+ if (!hunks) {
+ DebugPrintf("No hunk segment found.\n");
+ return true;
+ }
+
+ if (memoryHandle.segment != id || !hunks->isValidOffset(memoryHandle.offset)) {
+ DebugPrintf("Invalid address.\n");
+ return true;
+ }
+
+ const Hunk& h = hunks->_table[memoryHandle.offset];
+
+ if (strcmp(h.type, "SaveBits()") != 0) {
+ DebugPrintf("Invalid address.\n");
+ return true;
+ }
+
+ byte *memoryPtr = segman->getHunkPointer(memoryHandle);
+
+ if (!memoryPtr) {
+ DebugPrintf("Invalid or freed bits.\n");
+ return true;
+ }
+
+ // Now we _finally_ know these are valid saved bits
+
+ Common::Rect rect;
+ byte mask;
+ assert(h.size >= sizeof(rect) + sizeof(mask));
+
+ memcpy((void *)&rect, memoryPtr, sizeof(rect));
+ memcpy((void *)&mask, memoryPtr + sizeof(rect), sizeof(mask));
+
+ Common::Point tl(rect.left, rect.top);
+ Common::Point tr(rect.right-1, rect.top);
+ Common::Point bl(rect.left, rect.bottom-1);
+ Common::Point br(rect.right-1, rect.bottom-1);
+
+ DebugPrintf(" %d,%d - %d,%d", rect.top, rect.left,
+ rect.bottom, rect.right);
+ if (mask & GFX_SCREEN_MASK_VISUAL)
+ DebugPrintf(" visual");
+ if (mask & GFX_SCREEN_MASK_PRIORITY)
+ DebugPrintf(" priority");
+ if (mask & GFX_SCREEN_MASK_CONTROL)
+ DebugPrintf(" control");
+ if (mask & GFX_SCREEN_MASK_DISPLAY)
+ DebugPrintf(" display");
+ DebugPrintf("\n");
+
+ if (!_engine->_gfxPaint16 || !_engine->_gfxScreen)
+ return true;
+
+ // We backup all planes, and then flash the saved bits
+ // FIXME: This probably won't work well with hi-res games
+
+ byte bakMask = GFX_SCREEN_MASK_VISUAL | GFX_SCREEN_MASK_PRIORITY | GFX_SCREEN_MASK_CONTROL;
+ int bakSize = _engine->_gfxScreen->bitsGetDataSize(rect, bakMask);
+ reg_t bakScreen = segman->allocateHunkEntry("show_saved_bits backup", bakSize);
+ byte* bakMemory = segman->getHunkPointer(bakScreen);
+ assert(bakMemory);
+ _engine->_gfxScreen->bitsSave(rect, bakMask, bakMemory);
+
+ const int paintCount = 3;
+ for (int i = 0; i < paintCount; ++i) {
+ _engine->_gfxScreen->bitsRestore(memoryPtr);
+ _engine->_gfxScreen->drawLine(tl, tr, 0, 255, 255);
+ _engine->_gfxScreen->drawLine(tr, br, 0, 255, 255);
+ _engine->_gfxScreen->drawLine(br, bl, 0, 255, 255);
+ _engine->_gfxScreen->drawLine(bl, tl, 0, 255, 255);
+ _engine->_gfxScreen->copyRectToScreen(rect);
+ g_system->updateScreen();
+ g_sci->sleep(500);
+ _engine->_gfxScreen->bitsRestore(bakMemory);
+ _engine->_gfxScreen->copyRectToScreen(rect);
+ g_system->updateScreen();
+ if (i < paintCount - 1)
+ g_sci->sleep(500);
+ }
+
+ _engine->_gfxPaint16->bitsFree(bakScreen);
+
+ return true;
+}
+
+
bool Console::cmdParseGrammar(int argc, const char **argv) {
DebugPrintf("Parse grammar, in strict GNF:\n");
diff --git a/engines/sci/console.h b/engines/sci/console.h
index 1e2ebe4..d943923 100644
--- a/engines/sci/console.h
+++ b/engines/sci/console.h
@@ -94,6 +94,8 @@ private:
bool cmdPlayVideo(int argc, const char **argv);
bool cmdAnimateList(int argc, const char **argv);
bool cmdWindowList(int argc, const char **argv);
+ bool cmdSavedBits(int argc, const char **argv);
+ bool cmdShowSavedBits(int argc, const char **argv);
// Segments
bool cmdPrintSegmentTable(int argc, const char **argv);
bool cmdSegmentInfo(int argc, const char **argv);
Commit: 4296ac6d15e163b0c6b4fff5665e7add444ba310
https://github.com/scummvm/scummvm/commit/4296ac6d15e163b0c6b4fff5665e7add444ba310
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-06-11T17:00:09-07:00
Commit Message:
SCI: Fix sign in disasm of relative jumps
Changed paths:
engines/sci/engine/scriptdebug.cpp
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 16098ab..9579307 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -174,13 +174,15 @@ reg_t disassemble(EngineState *s, reg_t pos, bool printBWTag, bool printBytecode
break;
case Script_SRelative:
- if (opsize)
- param_value = scr[retval.offset++];
+ if (opsize) {
+ int8 offset = (int8)scr[retval.offset++];
+ debugN(" %02x [%04x]", 0xff & offset, 0xffff & (retval.offset + offset));
+ }
else {
- param_value = READ_SCI11ENDIAN_UINT16(&scr[retval.offset]);
+ int16 offset = (int16)READ_SCI11ENDIAN_UINT16(&scr[retval.offset]);
retval.offset += 2;
+ debugN(" %04x [%04x]", 0xffff & offset, 0xffff & (retval.offset + offset));
}
- debugN(opsize ? " %02x [%04x]" : " %04x [%04x]", param_value, (0xffff) & (retval.offset + param_value));
break;
case Script_End:
More information about the Scummvm-git-logs
mailing list