From 3143f7a0fc37b5b21d60cef9f2d6e39adaf22519 Mon Sep 17 00:00:00 2001 From: "rginda%netscape.com" Date: Tue, 18 Apr 2000 01:31:24 +0000 Subject: [PATCH] regenerated opcodenames to include padding, added label printing back into icg::print git-svn-id: svn://10.0.0.236/trunk@66226 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/js2/icodegenerator.cpp | 15 ++++--- mozilla/js/js2/vmtypes.h | 67 +++++++++++++++--------------- mozilla/js2/src/icodegenerator.cpp | 15 ++++--- mozilla/js2/src/vmtypes.h | 67 +++++++++++++++--------------- 4 files changed, 86 insertions(+), 78 deletions(-) diff --git a/mozilla/js/js2/icodegenerator.cpp b/mozilla/js/js2/icodegenerator.cpp index 9a1de2b3cc2..cc230e8757f 100644 --- a/mozilla/js/js2/icodegenerator.cpp +++ b/mozilla/js/js2/icodegenerator.cpp @@ -617,17 +617,20 @@ complete() f << "ICG! " << (uint32)iCode->size() << "\n"; for (InstructionIterator i = iCode->begin(); i != iCode->end(); i++) { + bool isLabel = false; - f << **i << "\n"; - /* for (LabelList::iterator k = labels.begin(); k != labels.end(); k++) - if ((ptrdiff_t)(*k)->itsOffset == (i - iCode->begin())) { - //s << "label #" << (k - labels.begin()) << ":\n"; - s << "#" << (i - iCode->begin()); + if ((ptrdiff_t)(*k)->offset == (i - iCode->begin())) { + f << "#" << (uint32)(i - iCode->begin()) << "\t"; + isLabel = true; break; } - */ + + if (!isLabel) + f << "\t"; + + f << **i << "\n"; } return f; diff --git a/mozilla/js/js2/vmtypes.h b/mozilla/js/js2/vmtypes.h index 6dbe678d536..012db85b3da 100644 --- a/mozilla/js/js2/vmtypes.h +++ b/mozilla/js/js2/vmtypes.h @@ -80,40 +80,41 @@ namespace JavaScript { /********************************************************************/ - static const char *opcodeNames[] = { - "ADD", - "BRANCH", - "BRANCH_EQ", - "BRANCH_GE", - "BRANCH_GT", - "BRANCH_LE", - "BRANCH_LT", - "BRANCH_NE", - "CALL", - "COMPARE_EQ", - "COMPARE_GE", - "COMPARE_GT", - "COMPARE_LE", - "COMPARE_LT", - "COMPARE_NE", - "DIVIDE", - "GET_ELEMENT", - "GET_PROP", + + static char *opcodeNames[] = { + "ADD ", + "BRANCH ", + "BRANCH_EQ ", + "BRANCH_GE ", + "BRANCH_GT ", + "BRANCH_LE ", + "BRANCH_LT ", + "BRANCH_NE ", + "CALL ", + "COMPARE_EQ ", + "COMPARE_GE ", + "COMPARE_GT ", + "COMPARE_LE ", + "COMPARE_LT ", + "COMPARE_NE ", + "DIVIDE ", + "GET_ELEMENT ", + "GET_PROP ", "LOAD_IMMEDIATE", - "LOAD_NAME", - "LOAD_VAR", - "MOVE", - "MULTIPLY", - "NEW_ARRAY", - "NEW_OBJECT", - "NOP", - "NOT", - "RETURN", - "SAVE_NAME", - "SAVE_VAR", - "SET_ELEMENT", - "SET_PROP", - "SUBTRACT" + "LOAD_NAME ", + "LOAD_VAR ", + "MOVE ", + "MULTIPLY ", + "NEW_ARRAY ", + "NEW_OBJECT ", + "NOP ", + "NOT ", + "RETURN ", + "SAVE_NAME ", + "SAVE_VAR ", + "SET_ELEMENT ", + "SET_PROP ", + "SUBTRACT " }; /********************************************************************/ diff --git a/mozilla/js2/src/icodegenerator.cpp b/mozilla/js2/src/icodegenerator.cpp index 9a1de2b3cc2..cc230e8757f 100644 --- a/mozilla/js2/src/icodegenerator.cpp +++ b/mozilla/js2/src/icodegenerator.cpp @@ -617,17 +617,20 @@ complete() f << "ICG! " << (uint32)iCode->size() << "\n"; for (InstructionIterator i = iCode->begin(); i != iCode->end(); i++) { + bool isLabel = false; - f << **i << "\n"; - /* for (LabelList::iterator k = labels.begin(); k != labels.end(); k++) - if ((ptrdiff_t)(*k)->itsOffset == (i - iCode->begin())) { - //s << "label #" << (k - labels.begin()) << ":\n"; - s << "#" << (i - iCode->begin()); + if ((ptrdiff_t)(*k)->offset == (i - iCode->begin())) { + f << "#" << (uint32)(i - iCode->begin()) << "\t"; + isLabel = true; break; } - */ + + if (!isLabel) + f << "\t"; + + f << **i << "\n"; } return f; diff --git a/mozilla/js2/src/vmtypes.h b/mozilla/js2/src/vmtypes.h index 6dbe678d536..012db85b3da 100644 --- a/mozilla/js2/src/vmtypes.h +++ b/mozilla/js2/src/vmtypes.h @@ -80,40 +80,41 @@ namespace JavaScript { /********************************************************************/ - static const char *opcodeNames[] = { - "ADD", - "BRANCH", - "BRANCH_EQ", - "BRANCH_GE", - "BRANCH_GT", - "BRANCH_LE", - "BRANCH_LT", - "BRANCH_NE", - "CALL", - "COMPARE_EQ", - "COMPARE_GE", - "COMPARE_GT", - "COMPARE_LE", - "COMPARE_LT", - "COMPARE_NE", - "DIVIDE", - "GET_ELEMENT", - "GET_PROP", + + static char *opcodeNames[] = { + "ADD ", + "BRANCH ", + "BRANCH_EQ ", + "BRANCH_GE ", + "BRANCH_GT ", + "BRANCH_LE ", + "BRANCH_LT ", + "BRANCH_NE ", + "CALL ", + "COMPARE_EQ ", + "COMPARE_GE ", + "COMPARE_GT ", + "COMPARE_LE ", + "COMPARE_LT ", + "COMPARE_NE ", + "DIVIDE ", + "GET_ELEMENT ", + "GET_PROP ", "LOAD_IMMEDIATE", - "LOAD_NAME", - "LOAD_VAR", - "MOVE", - "MULTIPLY", - "NEW_ARRAY", - "NEW_OBJECT", - "NOP", - "NOT", - "RETURN", - "SAVE_NAME", - "SAVE_VAR", - "SET_ELEMENT", - "SET_PROP", - "SUBTRACT" + "LOAD_NAME ", + "LOAD_VAR ", + "MOVE ", + "MULTIPLY ", + "NEW_ARRAY ", + "NEW_OBJECT ", + "NOP ", + "NOT ", + "RETURN ", + "SAVE_NAME ", + "SAVE_VAR ", + "SET_ELEMENT ", + "SET_PROP ", + "SUBTRACT " }; /********************************************************************/