[Scummvm-git-logs] scummvm master -> 2a3afdecbdfaac97189e27afec61b7a161470b3d
sev-
sev at scummvm.org
Tue Jan 14 18:52:06 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2a3afdecbd DIRECTOR: LINGO: Sorted list of bytecodes
Commit: 2a3afdecbdfaac97189e27afec61b7a161470b3d
https://github.com/scummvm/scummvm/commit/2a3afdecbdfaac97189e27afec61b7a161470b3d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-14T19:51:19+01:00
Commit Message:
DIRECTOR: LINGO: Sorted list of bytecodes
Changed paths:
engines/director/lingo/lingo-bytecode.cpp
engines/director/lingo/lingo-code.cpp
engines/director/lingo/lingo-code.h
diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index 5a71233..b5b46d0 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -191,6 +191,23 @@ void Lingo::initBytecode() {
}
}
+void LC::cb_unk() {
+ uint opcode = g_lingo->readInt();
+ warning("STUB: opcode 0x%02x", opcode);
+}
+
+void LC::cb_unk1() {
+ uint opcode = g_lingo->readInt();
+ uint arg1 = g_lingo->readInt();
+ warning("STUB: opcode 0x%02x (%d)", opcode, arg1);
+}
+
+void LC::cb_unk2() {
+ uint opcode = g_lingo->readInt();
+ uint arg1 = g_lingo->readInt();
+ uint arg2 = g_lingo->readInt();
+ warning("STUB: opcode 0x%02x (%d, %d)", opcode, arg1, arg2);
+}
void LC::cb_field() {
LB::b_field(1);
@@ -676,12 +693,12 @@ void Lingo::addCodeV4(Common::SeekableSubReadStreamEndian &stream, ScriptType ty
if (opcode < 0x40) { // 1 byte instruction
debugC(5, kDebugLingoCompile, "Unimplemented opcode: 0x%02x", opcode);
offsetList.push_back(_currentScript->size());
- g_lingo->code1(LC::c_unk);
+ g_lingo->code1(LC::cb_unk);
g_lingo->codeInt(opcode);
} else if (opcode < 0x80) { // 2 byte instruction
debugC(5, kDebugLingoCompile, "Unimplemented opcode: 0x%02x (%d)", opcode, (uint)codeStore[pointer]);
offsetList.push_back(_currentScript->size());
- g_lingo->code1(LC::c_unk1);
+ g_lingo->code1(LC::cb_unk1);
g_lingo->codeInt(opcode);
offsetList.push_back(_currentScript->size());
g_lingo->codeInt((uint)codeStore[pointer]);
@@ -689,7 +706,7 @@ void Lingo::addCodeV4(Common::SeekableSubReadStreamEndian &stream, ScriptType ty
} else { // 3 byte instruction
debugC(5, kDebugLingoCompile, "Unimplemented opcode: 0x%02x (%d, %d)", opcode, (uint)codeStore[pointer], (uint)codeStore[pointer+1]);
offsetList.push_back(_currentScript->size());
- g_lingo->code1(LC::c_unk2);
+ g_lingo->code1(LC::cb_unk2);
g_lingo->codeInt(opcode);
offsetList.push_back(_currentScript->size());
g_lingo->codeInt((uint)codeStore[pointer]);
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 7715ff7..9add66f 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -59,88 +59,88 @@ static struct FuncDescr {
const char *args;
} funcDescr[] = {
{ 0, "STOP", "" },
- { LC::c_xpop, "c_xpop", "" },
- { LC::c_argcpush, "c_argcpush", "i" },
+ { LC::c_add, "c_add", "" },
+ { LC::c_after, "c_after", "" }, // D3
+ { LC::c_ampersand, "c_ampersand", "" },
+ { LC::c_and, "c_and", "" },
{ LC::c_argcnoretpush, "c_argcnoretpush", "i" },
+ { LC::c_argcpush, "c_argcpush", "i" },
{ LC::c_arraypush, "c_arraypush", "i" },
- { LC::c_proparraypush, "c_proparraypush", "i" },
- { LC::c_printtop, "c_printtop", "" },
- { LC::c_intpush, "c_intpush", "i" },
- { LC::c_voidpush, "c_voidpush", "" },
- { LC::c_floatpush, "c_floatpush", "f" },
- { LC::c_stringpush, "c_stringpush", "s" },
- { LC::c_symbolpush, "c_symbolpush", "s" }, // D3
- { LC::c_namepush, "c_namepush", "i" },
- { LC::c_varpush, "c_varpush", "s" },
- { LC::c_setImmediate, "c_setImmediate", "i" },
{ LC::c_assign, "c_assign", "" },
- { LC::c_eval, "c_eval", "s" },
- { LC::c_theentitypush, "c_theentitypush", "EF" }, // entity, field
- { LC::c_theentityassign,"c_theentityassign","EF" },
- { LC::c_objectfieldpush,"c_objectfieldpush","sF" }, // object, field
- { LC::c_objectfieldassign,"c_objectfieldassign","sF" },
- { LC::c_swap, "c_swap", "" },
- { LC::c_add, "c_add", "" },
- { LC::c_sub, "c_sub", "" },
- { LC::c_mul, "c_mul", "" },
- { LC::c_div, "c_div", "" },
- { LC::c_mod, "c_mod", "" },
- { LC::c_negate, "c_negate", "" },
- { LC::c_ampersand, "c_ampersand", "" },
- { LC::c_after, "c_after", "" }, // D3
{ LC::c_before, "c_before", "" }, // D3
+ { LC::c_call, "c_call", "si" },
+ { LC::c_charOf, "c_charOf", "" }, // D3
+ { LC::c_charToOf, "c_charToOf", "" }, // D3
{ LC::c_concat, "c_concat", "" },
{ LC::c_contains, "c_contains", "" },
- { LC::c_starts, "c_starts", "" },
+ { LC::c_div, "c_div", "" },
+ { LC::c_eq, "c_eq", "" },
+ { LC::c_eval, "c_eval", "s" },
+ { LC::c_exitRepeat, "c_exitRepeat", "" },
+ { LC::c_floatpush, "c_floatpush", "f" },
+ { LC::c_ge, "c_ge", "" },
+ { LC::c_global, "c_global", "s" },
+ { LC::c_goto, "c_goto", "" },
+ { LC::c_gotoloop, "c_gotoloop", "" },
+ { LC::c_gotonext, "c_gotonext", "" },
+ { LC::c_gotoprevious, "c_gotoprevious", "" },
+ { LC::c_gt, "c_gt", "" },
+ { LC::c_hilite, "c_hilite", "" },
+ { LC::c_ifcode, "c_ifcode", "oooi" },
+ { LC::c_instance, "c_instance", "s" },
{ LC::c_intersects, "c_intersects", "" },
- { LC::c_within, "c_within", "" },
- { LC::c_of, "c_of", "" },
- { LC::c_charOf, "c_charOf", "" }, // D3
- { LC::c_charToOf, "c_charToOf", "" }, // D3
+ { LC::c_intpush, "c_intpush", "i" },
{ LC::c_itemOf, "c_itemOf", "" }, // D3
{ LC::c_itemToOf, "c_itemToOf", "" }, // D3
+ { LC::c_jump, "c_jump", "i" },
+ { LC::c_jumpifz, "c_jumpifz", "i" },
+ { LC::c_le, "c_le", "" },
{ LC::c_lineOf, "c_lineOf", "" }, // D3
{ LC::c_lineToOf, "c_lineToOf", "" }, // D3
- { LC::c_wordOf, "c_wordOf", "" }, // D3
- { LC::c_wordToOf, "c_wordToOf", "" }, // D3
- { LC::c_and, "c_and", "" },
- { LC::c_or, "c_or", "" },
- { LC::c_not, "c_not", "" },
- { LC::c_eq, "c_eq", "" },
- { LC::c_neq, "c_neq", "" },
- { LC::c_gt, "c_gt", "" },
{ LC::c_lt, "c_lt", "" },
- { LC::c_ge, "c_ge", "" },
- { LC::c_le, "c_le", "" },
- { LC::c_jump, "c_jump", "i" },
- { LC::c_jumpifz, "c_jumpifz", "i" },
+ { LC::c_mod, "c_mod", "" },
+ { LC::c_mul, "c_mul", "" },
+ { LC::c_namepush, "c_namepush", "i" },
+ { LC::c_negate, "c_negate", "" },
+ { LC::c_neq, "c_neq", "" },
+ { LC::c_not, "c_not", "" },
+ { LC::c_objectfieldassign,"c_objectfieldassign","sF" },
+ { LC::c_objectfieldpush,"c_objectfieldpush","sF" }, // object, field
+ { LC::c_of, "c_of", "" },
+ { LC::c_open, "c_open", "" },
+ { LC::c_or, "c_or", "" },
+ { LC::c_play, "c_play", "" },
+ { LC::c_playdone, "c_playdone", "" },
+ { LC::c_printtop, "c_printtop", "" },
+ { LC::c_procret, "c_procret", "" },
+ { LC::c_proparraypush, "c_proparraypush", "i" },
+ { LC::c_property, "c_property", "s" },
{ LC::c_repeatwhilecode,"c_repeatwhilecode","oo" },
{ LC::c_repeatwithcode, "c_repeatwithcode", "ooooos" },
- { LC::c_exitRepeat, "c_exitRepeat", "" },
- { LC::c_ifcode, "c_ifcode", "oooi" },
- { LC::c_tellcode, "c_tellcode", "o" },
+ { LC::c_setImmediate, "c_setImmediate", "i" },
+ { LC::c_starts, "c_starts", "" },
+ { LC::c_stringpush, "c_stringpush", "s" },
+ { LC::c_sub, "c_sub", "" },
+ { LC::c_swap, "c_swap", "" },
+ { LC::c_symbolpush, "c_symbolpush", "s" }, // D3
{ LC::c_tell, "c_tell", "" },
+ { LC::c_tellcode, "c_tellcode", "o" },
{ LC::c_telldone, "c_telldone", "" },
+ { LC::c_theentityassign,"c_theentityassign","EF" },
+ { LC::c_theentitypush, "c_theentitypush", "EF" }, // entity, field
+ { LC::c_varpush, "c_varpush", "s" },
+ { LC::c_voidpush, "c_voidpush", "" },
{ LC::c_whencode, "c_whencode", "os" },
- { LC::c_goto, "c_goto", "" },
- { LC::c_gotoloop, "c_gotoloop", "" },
- { LC::c_gotonext, "c_gotonext", "" },
- { LC::c_gotoprevious, "c_gotoprevious", "" },
- { LC::c_play, "c_play", "" },
- { LC::c_playdone, "c_playdone", "" },
- { LC::c_call, "c_call", "si" },
- { LC::c_procret, "c_procret", "" },
- { LC::c_global, "c_global", "s" },
- { LC::c_property, "c_property", "s" },
- { LC::c_instance, "c_instance", "s" },
- { LC::c_open, "c_open", "" },
- { LC::c_hilite, "c_hilite", "" },
- { LC::c_unk, "c_unk", "i" },
- { LC::c_unk1, "c_unk1", "ii" },
- { LC::c_unk2, "c_unk2", "iii" },
+ { LC::c_within, "c_within", "" },
+ { LC::c_wordOf, "c_wordOf", "" }, // D3
+ { LC::c_wordToOf, "c_wordToOf", "" }, // D3
+ { LC::c_xpop, "c_xpop", "" },
{ LC::cb_call, "cb_call", "i" },
{ LC::cb_field, "cb_field", "" },
{ LC::cb_localcall, "cb_localcall", "i" },
+ { LC::cb_unk, "cb_unk", "i" },
+ { LC::cb_unk1, "cb_unk1", "ii" },
+ { LC::cb_unk2, "cb_unk2", "iii" },
{ LC::cb_v4putvalue, "cb_putvalue", "i" },
{ LC::cb_v4theentitypush,"cb_v4theentitypush","i" },
{ LC::cb_v4theentitynamepush,"cb_v4theentitynamepush","i" },
@@ -1337,23 +1337,4 @@ void LC::c_hilite() {
cast_id.u.i);
}
-void LC::c_unk() {
- uint opcode = g_lingo->readInt();
- warning("STUB: opcode 0x%02x", opcode);
-}
-
-void LC::c_unk1() {
- uint opcode = g_lingo->readInt();
- uint arg1 = g_lingo->readInt();
- warning("STUB: opcode 0x%02x (%d)", opcode, arg1);
-}
-
-void LC::c_unk2() {
- uint opcode = g_lingo->readInt();
- uint arg1 = g_lingo->readInt();
- uint arg2 = g_lingo->readInt();
- warning("STUB: opcode 0x%02x (%d, %d)", opcode, arg1, arg2);
-}
-
-
}
diff --git a/engines/director/lingo/lingo-code.h b/engines/director/lingo/lingo-code.h
index db3521b..1aedfb2 100644
--- a/engines/director/lingo/lingo-code.h
+++ b/engines/director/lingo/lingo-code.h
@@ -122,9 +122,9 @@ namespace LC {
void c_hilite();
// stubs for unknown instructions
- void c_unk();
- void c_unk1();
- void c_unk2();
+ void cb_unk();
+ void cb_unk1();
+ void cb_unk2();
// bytecode-related instructions
void cb_localcall();
More information about the Scummvm-git-logs
mailing list