From c69750c8cd9a06910411b5c3323629efd6cfcda5 Mon Sep 17 00:00:00 2001
From: "rginda%netscape.com"
 <rginda%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 29 Jul 2000 02:00:12 +0000
Subject: [PATCH] shut up "unused param" warnings by only naming the register
 param if the icode uses a RegisterList operand.

git-svn-id: svn://10.0.0.236/trunk@75134 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/js2/icode.h          | 74 ++++++++++++++++-----------------
 mozilla/js/js2/tools/gencode.pl |  5 ++-
 mozilla/js2/src/icode.h         | 74 ++++++++++++++++-----------------
 mozilla/js2/tools/gencode.pl    |  5 ++-
 4 files changed, 80 insertions(+), 78 deletions(-)

diff --git a/mozilla/js/js2/icode.h b/mozilla/js/js2/icode.h
index 69b0169e516..82ee6a044e8 100644
--- a/mozilla/js/js2/icode.h
+++ b/mozilla/js/js2/icode.h
@@ -103,7 +103,7 @@
             f << opcodeNames[BITNOT] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -168,7 +168,7 @@
             f << opcodeNames[CAST] << "\t" << mOp1 << ", " << mOp2 << ", " << "'" << mOp3->getName() << "'";
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -262,7 +262,7 @@
             f << opcodeNames[DELETE_PROP] << "\t" << mOp1 << ", " << mOp2 << ", " << "'" << *mOp3 << "'";
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -287,7 +287,7 @@
             f << opcodeNames[ELEM_XCR] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3 << ", " << mOp4;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first << ", " << mOp3.first;
             return f;
         }
@@ -303,7 +303,7 @@
             f << opcodeNames[GENERIC_BINARY_OP] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3 << ", " << mOp4;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp3.first << ", " << mOp4.first;
             return f;
         }
@@ -319,7 +319,7 @@
             f << opcodeNames[GET_ELEMENT] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first << ", " << mOp3.first;
             return f;
         }
@@ -335,7 +335,7 @@
             f << opcodeNames[GET_METHOD] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -351,7 +351,7 @@
             f << opcodeNames[GET_PROP] << "\t" << mOp1 << ", " << mOp2 << ", " << "'" << *mOp3 << "'";
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -367,7 +367,7 @@
             f << opcodeNames[GET_SLOT] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -383,7 +383,7 @@
             f << opcodeNames[GET_STATIC] << "\t" << mOp1 << ", " << mOp2->getName() << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -423,7 +423,7 @@
             f << opcodeNames[LOAD_BOOLEAN] << "\t" << mOp1 << ", " << "'" << ((mOp2) ? "true" : "false") << "'";
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -439,7 +439,7 @@
             f << opcodeNames[LOAD_IMMEDIATE] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -455,7 +455,7 @@
             f << opcodeNames[LOAD_NAME] << "\t" << mOp1 << ", " << "'" << *mOp2 << "'";
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -471,7 +471,7 @@
             f << opcodeNames[LOAD_STRING] << "\t" << mOp1 << ", " << "'" << *mOp2 << "'";
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -487,7 +487,7 @@
             f << opcodeNames[MOVE] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -512,7 +512,7 @@
             f << opcodeNames[NAME_XCR] << "\t" << mOp1 << ", " << "'" << *mOp2 << "'" << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -528,7 +528,7 @@
             f << opcodeNames[NEGATE] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -544,7 +544,7 @@
             f << opcodeNames[NEW_ARRAY] << "\t" << mOp1;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -560,7 +560,7 @@
             f << opcodeNames[NEW_CLASS] << "\t" << mOp1 << ", " << mOp2->getName();
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -576,7 +576,7 @@
             f << opcodeNames[NEW_FUNCTION] << "\t" << mOp1 << ", " << "ICodeModule";
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -592,7 +592,7 @@
             f << opcodeNames[NEW_OBJECT] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -623,7 +623,7 @@
             f << opcodeNames[NOT] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -648,7 +648,7 @@
             f << opcodeNames[POSATE] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -664,7 +664,7 @@
             f << opcodeNames[PROP_XCR] << "\t" << mOp1 << ", " << mOp2 << ", " << "'" << *mOp3 << "'" << ", " << mOp4;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -689,7 +689,7 @@
             f << opcodeNames[RETURN] << "\t" << mOp1;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -735,7 +735,7 @@
             f << opcodeNames[SAVE_NAME] << "\t" << "'" << *mOp1 << "'" << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp2.first;
             return f;
         }
@@ -751,7 +751,7 @@
             f << opcodeNames[SET_ELEMENT] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first << ", " << mOp3.first;
             return f;
         }
@@ -767,7 +767,7 @@
             f << opcodeNames[SET_PROP] << "\t" << mOp1 << ", " << "'" << *mOp2 << "'" << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp3.first;
             return f;
         }
@@ -783,7 +783,7 @@
             f << opcodeNames[SET_SLOT] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp3.first;
             return f;
         }
@@ -799,7 +799,7 @@
             f << opcodeNames[SET_STATIC] << "\t" << mOp1->getName() << ", " << mOp2 << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp3.first;
             return f;
         }
@@ -833,7 +833,7 @@
             f << opcodeNames[SLOT_XCR] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3 << ", " << mOp4;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -849,7 +849,7 @@
             f << opcodeNames[STATIC_XCR] << "\t" << mOp1 << ", " << mOp2->getName() << ", " << mOp3 << ", " << mOp4;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -892,7 +892,7 @@
             f << opcodeNames[SUPER] << "\t" << mOp1;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -908,7 +908,7 @@
             f << opcodeNames[TEST] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -924,7 +924,7 @@
             f << opcodeNames[THROW] << "\t" << mOp1;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -979,7 +979,7 @@
             f << opcodeNames[VAR_XCR] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -995,7 +995,7 @@
             f << opcodeNames[WITHIN] << "\t" << mOp1;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
diff --git a/mozilla/js/js2/tools/gencode.pl b/mozilla/js/js2/tools/gencode.pl
index 52bea9ec881..464151705ba 100644
--- a/mozilla/js/js2/tools/gencode.pl
+++ b/mozilla/js/js2/tools/gencode.pl
@@ -421,9 +421,10 @@ sub collect {
 
             my $printops_body = &get_printops_body(@types);
             my $printops_decl =  "virtual Formatter& printOperands(Formatter& f, ";
-            $printops_decl .= ($printops_body ne "" ?
+
+            $printops_decl .= ($dec_list =~ /RegisterList/) ?
                                "const JSValues& registers" :
-                               "const JSValues& /*registers*/");
+                               "const JSValues& /*registers*/";
             $printops_decl .= ") {\n";
 
             $class_decs .= ($init_tab . $tab . 
diff --git a/mozilla/js2/src/icode.h b/mozilla/js2/src/icode.h
index 69b0169e516..82ee6a044e8 100644
--- a/mozilla/js2/src/icode.h
+++ b/mozilla/js2/src/icode.h
@@ -103,7 +103,7 @@
             f << opcodeNames[BITNOT] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -168,7 +168,7 @@
             f << opcodeNames[CAST] << "\t" << mOp1 << ", " << mOp2 << ", " << "'" << mOp3->getName() << "'";
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -262,7 +262,7 @@
             f << opcodeNames[DELETE_PROP] << "\t" << mOp1 << ", " << mOp2 << ", " << "'" << *mOp3 << "'";
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -287,7 +287,7 @@
             f << opcodeNames[ELEM_XCR] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3 << ", " << mOp4;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first << ", " << mOp3.first;
             return f;
         }
@@ -303,7 +303,7 @@
             f << opcodeNames[GENERIC_BINARY_OP] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3 << ", " << mOp4;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp3.first << ", " << mOp4.first;
             return f;
         }
@@ -319,7 +319,7 @@
             f << opcodeNames[GET_ELEMENT] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first << ", " << mOp3.first;
             return f;
         }
@@ -335,7 +335,7 @@
             f << opcodeNames[GET_METHOD] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -351,7 +351,7 @@
             f << opcodeNames[GET_PROP] << "\t" << mOp1 << ", " << mOp2 << ", " << "'" << *mOp3 << "'";
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -367,7 +367,7 @@
             f << opcodeNames[GET_SLOT] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -383,7 +383,7 @@
             f << opcodeNames[GET_STATIC] << "\t" << mOp1 << ", " << mOp2->getName() << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -423,7 +423,7 @@
             f << opcodeNames[LOAD_BOOLEAN] << "\t" << mOp1 << ", " << "'" << ((mOp2) ? "true" : "false") << "'";
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -439,7 +439,7 @@
             f << opcodeNames[LOAD_IMMEDIATE] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -455,7 +455,7 @@
             f << opcodeNames[LOAD_NAME] << "\t" << mOp1 << ", " << "'" << *mOp2 << "'";
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -471,7 +471,7 @@
             f << opcodeNames[LOAD_STRING] << "\t" << mOp1 << ", " << "'" << *mOp2 << "'";
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -487,7 +487,7 @@
             f << opcodeNames[MOVE] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -512,7 +512,7 @@
             f << opcodeNames[NAME_XCR] << "\t" << mOp1 << ", " << "'" << *mOp2 << "'" << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -528,7 +528,7 @@
             f << opcodeNames[NEGATE] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -544,7 +544,7 @@
             f << opcodeNames[NEW_ARRAY] << "\t" << mOp1;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -560,7 +560,7 @@
             f << opcodeNames[NEW_CLASS] << "\t" << mOp1 << ", " << mOp2->getName();
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -576,7 +576,7 @@
             f << opcodeNames[NEW_FUNCTION] << "\t" << mOp1 << ", " << "ICodeModule";
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -592,7 +592,7 @@
             f << opcodeNames[NEW_OBJECT] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -623,7 +623,7 @@
             f << opcodeNames[NOT] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -648,7 +648,7 @@
             f << opcodeNames[POSATE] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -664,7 +664,7 @@
             f << opcodeNames[PROP_XCR] << "\t" << mOp1 << ", " << mOp2 << ", " << "'" << *mOp3 << "'" << ", " << mOp4;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -689,7 +689,7 @@
             f << opcodeNames[RETURN] << "\t" << mOp1;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -735,7 +735,7 @@
             f << opcodeNames[SAVE_NAME] << "\t" << "'" << *mOp1 << "'" << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp2.first;
             return f;
         }
@@ -751,7 +751,7 @@
             f << opcodeNames[SET_ELEMENT] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first << ", " << mOp3.first;
             return f;
         }
@@ -767,7 +767,7 @@
             f << opcodeNames[SET_PROP] << "\t" << mOp1 << ", " << "'" << *mOp2 << "'" << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp3.first;
             return f;
         }
@@ -783,7 +783,7 @@
             f << opcodeNames[SET_SLOT] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp3.first;
             return f;
         }
@@ -799,7 +799,7 @@
             f << opcodeNames[SET_STATIC] << "\t" << mOp1->getName() << ", " << mOp2 << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp3.first;
             return f;
         }
@@ -833,7 +833,7 @@
             f << opcodeNames[SLOT_XCR] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3 << ", " << mOp4;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -849,7 +849,7 @@
             f << opcodeNames[STATIC_XCR] << "\t" << mOp1 << ", " << mOp2->getName() << ", " << mOp3 << ", " << mOp4;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -892,7 +892,7 @@
             f << opcodeNames[SUPER] << "\t" << mOp1;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -908,7 +908,7 @@
             f << opcodeNames[TEST] << "\t" << mOp1 << ", " << mOp2;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -924,7 +924,7 @@
             f << opcodeNames[THROW] << "\t" << mOp1;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
@@ -979,7 +979,7 @@
             f << opcodeNames[VAR_XCR] << "\t" << mOp1 << ", " << mOp2 << ", " << mOp3;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first << ", " << mOp2.first;
             return f;
         }
@@ -995,7 +995,7 @@
             f << opcodeNames[WITHIN] << "\t" << mOp1;
             return f;
         }
-        virtual Formatter& printOperands(Formatter& f, const JSValues& registers) {
+        virtual Formatter& printOperands(Formatter& f, const JSValues& /*registers*/) {
             f << mOp1.first;
             return f;
         }
diff --git a/mozilla/js2/tools/gencode.pl b/mozilla/js2/tools/gencode.pl
index 52bea9ec881..464151705ba 100644
--- a/mozilla/js2/tools/gencode.pl
+++ b/mozilla/js2/tools/gencode.pl
@@ -421,9 +421,10 @@ sub collect {
 
             my $printops_body = &get_printops_body(@types);
             my $printops_decl =  "virtual Formatter& printOperands(Formatter& f, ";
-            $printops_decl .= ($printops_body ne "" ?
+
+            $printops_decl .= ($dec_list =~ /RegisterList/) ?
                                "const JSValues& registers" :
-                               "const JSValues& /*registers*/");
+                               "const JSValues& /*registers*/";
             $printops_decl .= ") {\n";
 
             $class_decs .= ($init_tab . $tab .