Merge.

2010-06-04 19:32:38 -07:00
parent aa425f1920 430984226f
commit 2ad83c8a5c
3 changed files with 149 additions and 0 deletions
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -479,6 +479,20 @@ mjit::Compiler::generateMethod()
            frame.push(UndefinedTag());
          END_CASE(JSOP_VOID)

+          BEGIN_CASE(JSOP_GETELEM)
+            prepareStubCall();
+            stubCall(stubs::GetElem, Uses(2), Defs(1));
+            frame.popn(2);
+            frame.pushSynced();
+          END_CASE(JSOP_GETELEM)
+
+          BEGIN_CASE(JSOP_SETELEM)
+            prepareStubCall();
+            stubCall(stubs::SetElem, Uses(3), Defs(1));
+            frame.popn(3);
+            frame.pushSynced();
+          END_CASE(JSOP_SETELEM);
+
          BEGIN_CASE(JSOP_CALLNAME)
            prepareStubCall();
            masm.move(Imm32(fullAtomIndex(PC)), Registers::ArgReg1);