Small cleanups and licensing blurb housekeeping.
authorAndreas Gal <gal@uci.edu>
Sat, 28 Jun 2008 09:58:15 -0700
changeset 17339 4f4a8b53b2933b56bd098ba1ee148b1aa86a5f68
parent 17336 af3f8c146e59da9877fb804c428688b01abd7239
child 17340 ba44622e1a78b8419891678cb5c2621e7023f7f5
push id1452
push usershaver@mozilla.com
push dateFri, 22 Aug 2008 00:08:22 +0000
treeherdermozilla-central@d13bb0868596 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.1a1pre
Small cleanups and licensing blurb housekeeping.
js/src/jsinterpinlines.h
js/src/jstracer.cpp
js/src/jstracer.h
js/src/jstracerinlines.h
js/src/nanojit/avmplus.cpp
js/src/nanojit/avmplus.h
--- a/js/src/jsinterpinlines.h
+++ b/js/src/jsinterpinlines.h
@@ -13,17 +13,17 @@
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
  * for the specific language governing rights and limitations under the
  * License.
  *
  * The Original Code is Mozilla SpiderMonkey JavaScript 1.9 code, released
  * May 28, 2008.
  *
  * The Initial Developer of the Original Code is
- *   Andreas Gal <gal@uci.edu>
+ *   Andreas Gal <gal@mozilla.com>
  *
  * Contributor(s):
  *   Brendan Eich <brendan@mozilla.org>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
  * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -13,19 +13,20 @@
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
  * for the specific language governing rights and limitations under the
  * License.
  *
  * The Original Code is Mozilla SpiderMonkey JavaScript 1.9 code, released
  * May 28, 2008.
  *
  * The Initial Developer of the Original Code is
- *   Brendan Eich <brendan@mozilla.org
+ *   Brendan Eich <brendan@mozilla.org>
  *
  * Contributor(s):
+ *   Andreas Gal <gal@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
  * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
@@ -307,29 +308,29 @@ TraceRecorder::imm(jsint i, void* v)
 
 void 
 TraceRecorder::imm(jsdouble d, void* v)
 {
     set(v, lir->insImmq(*(uint64_t*)&d));
 }
 
 void 
-TraceRecorder::unary(nanojit::LOpcode op, void* a, void* v)
+TraceRecorder::unary(LOpcode op, void* a, void* v)
 {
     set(v, lir->ins1(op, get(a)));
 }
 
 void 
-TraceRecorder::binary(nanojit::LOpcode op, void* a, void* b, void* v)
+TraceRecorder::binary(LOpcode op, void* a, void* b, void* v)
 {
     set(v, lir->ins2(op, get(a), get(b)));
 }
 
 void
-TraceRecorder::binary0(nanojit::LOpcode op, void* a, void* v)
+TraceRecorder::binary0(LOpcode op, void* a, void* v)
 {
     set(v, lir->ins2i(op, get(a), 0)); 
 }
 
 void 
 TraceRecorder::call(int id, void* a, void* v)
 {
     LInsp args[] = { get(a) };
@@ -434,19 +435,19 @@ TraceRecorder::load(void* a, int32_t i, 
 }
 
 bool
 js_StartRecording(JSContext* cx, JSFrameRegs& regs)
 {
     JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx);
     
     if (!tm->fragmento) {
-        Fragmento* fragmento = new (&gc) Fragmento(core);
+        Fragmento* fragmento = new Fragmento(core);
 #ifdef DEBUG        
-        fragmento->labels = new (&gc) LabelMap(core, NULL);
+        fragmento->labels = new LabelMap(core, NULL);
 #endif        
         fragmento->assm()->setCallTable(builtins);
         tm->fragmento = fragmento;
     }
 
     tm->recorder = new TraceRecorder(cx, regs, tm->fragmento);
 
     return true;
--- a/js/src/jstracer.h
+++ b/js/src/jstracer.h
@@ -13,19 +13,20 @@
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
  * for the specific language governing rights and limitations under the
  * License.
  *
  * The Original Code is Mozilla SpiderMonkey JavaScript 1.9 code, released
  * May 28, 2008.
  *
  * The Initial Developer of the Original Code is
- *   Brendan Eich <brendan@mozilla.org
+ *   Brendan Eich <brendan@mozilla.org>
  *
  * Contributor(s):
+ *   Andreas Gal <gal@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
  * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
@@ -98,17 +99,17 @@ class TraceRecorder {
     nanojit::LirBuffer*     lirbuf;
     nanojit::LirWriter*     lir;
 
     nanojit::SideExit* snapshot(nanojit::SideExit& exit, JSFrameRegs& regs);
 public:
     TraceRecorder(JSContext* cx, JSFrameRegs& regs, nanojit::Fragmento*);
     ~TraceRecorder();
     
-    inline jsbytecode* entryPC() 
+    inline jsbytecode* entryPC() const
     {
         return entryState.pc;
     }
     
     void init(void* p, nanojit::LIns* l);
     void set(void* p, nanojit::LIns* l);
     nanojit::LIns* get(void* p);
     
--- a/js/src/jstracerinlines.h
+++ b/js/src/jstracerinlines.h
@@ -16,16 +16,17 @@
  *
  * The Original Code is Mozilla SpiderMonkey JavaScript 1.9 code, released
  * May 28, 2008.
  *
  * The Initial Developer of the Original Code is
  *   Brendan Eich <brendan@mozilla.org>
  *
  * Contributor(s):
+ *   Andreas Gal <gal@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
  * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
--- a/js/src/nanojit/avmplus.cpp
+++ b/js/src/nanojit/avmplus.cpp
@@ -11,17 +11,17 @@
  * 
  * The Original Code is [Open Source Virtual Machine.] 
  * 
  * The Initial Developer of the Original Code is Adobe System Incorporated.  Portions created 
  * by the Initial Developer are Copyright (C)[ 2004-2006 ] Adobe Systems Incorporated. All Rights 
  * Reserved. 
  * 
  * Contributor(s): Adobe AS3 Team
- *                 Andreas Gal <gal@uci.edu>
+ *                 Andreas Gal <gal@mozilla.com>
  * 
  * Alternatively, the contents of this file may be used under the terms of either the GNU 
  * General Public License Version 2 or later (the "GPL"), or the GNU Lesser General Public 
  * License Version 2.1 or later (the "LGPL"), in which case the provisions of the GPL or the 
  * LGPL are applicable instead of those above. If you wish to allow use of your version of this 
  * file only under the terms of either the GPL or the LGPL, and not to allow others to use your 
  * version of this file under the terms of the MPL, indicate your decision by deleting provisions 
  * above and replace them with the notice and other provisions required by the GPL or the 
--- a/js/src/nanojit/avmplus.h
+++ b/js/src/nanojit/avmplus.h
@@ -11,17 +11,17 @@
  * 
  * The Original Code is [Open Source Virtual Machine.] 
  * 
  * The Initial Developer of the Original Code is Adobe System Incorporated.  Portions created 
  * by the Initial Developer are Copyright (C)[ 2004-2006 ] Adobe Systems Incorporated. All Rights 
  * Reserved. 
  * 
  * Contributor(s): Adobe AS3 Team
- *                 Andreas Gal <gal@uci.edu>
+ *                 Andreas Gal <gal@mozilla.com>
  * 
  * Alternatively, the contents of this file may be used under the terms of either the GNU 
  * General Public License Version 2 or later (the "GPL"), or the GNU Lesser General Public 
  * License Version 2.1 or later (the "LGPL"), in which case the provisions of the GPL or the 
  * LGPL are applicable instead of those above. If you wish to allow use of your version of this 
  * file only under the terms of either the GPL or the LGPL, and not to allow others to use your 
  * version of this file under the terms of the MPL, indicate your decision by deleting provisions 
  * above and replace them with the notice and other provisions required by the GPL or the