Changeset 155418 in webkit for trunk/Source/JavaScriptCore/jit/JIT.h

Timestamp:

Sep 9, 2013, 11:01:03 PM (12 years ago)

Author:

[email protected]

Message:

Change virtual register function arguments from unsigned to int
​https://bugs.webkit.org/show_bug.cgi?id=121055

Reviewed by Filip Pizlo.

This is a largely mechanical change. This changes function paramaters and local variables used to
represent bytecode operands from being unsigned to be int.

• bytecode/CodeOrigin.h:
• dfg/DFGByteCodeParser.cpp:
• jit/JIT.h:
• jit/JITArithmetic.cpp:
• jit/JITArithmetic32_64.cpp:
• jit/JITInlines.h:
• jit/JITOpcodes.cpp:
• jit/JITOpcodes32_64.cpp:
• jit/JITPropertyAccess.cpp:
• jit/JITPropertyAccess32_64.cpp:
• jit/JITStubCall.h:

File:

• trunk/Source/JavaScriptCore/jit/JIT.h (modified) (9 diffs)

trunk/Source/JavaScriptCore/jit/JIT.h

@@ -439 +439 @@
         enum CompileOpStrictEqType { OpStrictEq, OpNStrictEq };
         void compileOpStrictEq(Instruction* instruction, CompileOpStrictEqType type);
-        bool isOperandConstantImmediateDouble(unsigned src);
+        bool isOperandConstantImmediateDouble(int src);
         
         void emitLoadDouble(int index, FPRegisterID value);
@@ -510 +510 @@
 
 #if USE(JSVALUE32_64)
-        bool getOperandConstantImmediateInt(unsigned op1, unsigned op2, unsigned& op, int32_t& constant);
+        bool getOperandConstantImmediateInt(int op1, int op2, int& op, int32_t& constant);
 
         void emitLoadTag(int index, RegisterID tag);
@@ -547 +547 @@
 
         // Arithmetic opcode helpers
-        void emitAdd32Constant(unsigned dst, unsigned op, int32_t constant, ResultType opType);
-        void emitSub32Constant(unsigned dst, unsigned op, int32_t constant, ResultType opType);
-        void emitBinaryDoubleOp(OpcodeID, unsigned dst, unsigned op1, unsigned op2, OperandTypes, JumpList& notInt32Op1, JumpList& notInt32Op2, bool op1IsInRegisters = true, bool op2IsInRegisters = true);
+        void emitAdd32Constant(int dst, int op, int32_t constant, ResultType opType);
+        void emitSub32Constant(int dst, int op, int32_t constant, ResultType opType);
+        void emitBinaryDoubleOp(OpcodeID, int dst, int op1, int op2, OperandTypes, JumpList& notInt32Op1, JumpList& notInt32Op2, bool op1IsInRegisters = true, bool op2IsInRegisters = true);
 
 #if CPU(ARM_TRADITIONAL)
@@ -581 +581 @@
 #else // USE(JSVALUE32_64)
         /* This function is deprecated. */
-        void emitGetJITStubArg(unsigned argumentNumber, RegisterID dst);
+        void emitGetJITStubArg(int argumentNumber, RegisterID dst);
 
         void emitGetVirtualRegister(int src, RegisterID dst);
         void emitGetVirtualRegisters(int src1, RegisterID dst1, int src2, RegisterID dst2);
-        void emitPutVirtualRegister(unsigned dst, RegisterID from = regT0);
-        void emitStoreCell(unsigned dst, RegisterID payload, bool /* only used in JSValue32_64 */ = false)
+        void emitPutVirtualRegister(int dst, RegisterID from = regT0);
+        void emitStoreCell(int dst, RegisterID payload, bool /* only used in JSValue32_64 */ = false)
         {
             emitPutVirtualRegister(dst, payload);
         }
 
-        int32_t getConstantOperandImmediateInt(unsigned src);
+        int32_t getConstantOperandImmediateInt(int src);
 
         void killLastResultRegister();
@@ -610 +610 @@
 
         void emitTagAsBoolImmediate(RegisterID reg);
-        void compileBinaryArithOp(OpcodeID, unsigned dst, unsigned src1, unsigned src2, OperandTypes opi);
-        void compileBinaryArithOpSlowCase(Instruction*, OpcodeID, Vector<SlowCaseEntry>::iterator&, unsigned dst, unsigned src1, unsigned src2, OperandTypes, bool op1HasImmediateIntFastCase, bool op2HasImmediateIntFastCase);
+        void compileBinaryArithOp(OpcodeID, int dst, int src1, int src2, OperandTypes opi);
+        void compileBinaryArithOpSlowCase(Instruction*, OpcodeID, Vector<SlowCaseEntry>::iterator&, int dst, int src1, int src2, OperandTypes, bool op1HasImmediateIntFastCase, bool op2HasImmediateIntFastCase);
 
         void compileGetByIdHotPath(int baseVReg, const Identifier*);
@@ -636 +636 @@
 #endif
 
-        void emit_compareAndJump(OpcodeID, unsigned op1, unsigned op2, unsigned target, RelationalCondition);
-        void emit_compareAndJumpSlow(unsigned op1, unsigned op2, unsigned target, DoubleCondition, int (JIT_STUB *stub)(STUB_ARGS_DECLARATION), bool invert, Vector<SlowCaseEntry>::iterator&);
+        void emit_compareAndJump(OpcodeID, int op1, int op2, unsigned target, RelationalCondition);
+        void emit_compareAndJumpSlow(int op1, int op2, unsigned target, DoubleCondition, int (JIT_STUB *stub)(STUB_ARGS_DECLARATION), bool invert, Vector<SlowCaseEntry>::iterator&);
 
         void emit_op_add(Instruction*);
@@ -795 +795 @@
 
         void emitVarInjectionCheck(bool needsVarInjectionChecks);
-        void emitResolveClosure(unsigned dst, bool needsVarInjectionChecks, unsigned depth);
-        void emitLoadWithStructureCheck(unsigned scope, Structure** structureSlot);
+        void emitResolveClosure(int dst, bool needsVarInjectionChecks, unsigned depth);
+        void emitLoadWithStructureCheck(int scope, Structure** structureSlot);
         void emitGetGlobalProperty(uintptr_t* operandSlot);
         void emitGetGlobalVar(uintptr_t operand);
-        void emitGetClosureVar(unsigned scope, uintptr_t operand);
-        void emitPutGlobalProperty(uintptr_t* operandSlot, unsigned value);
-        void emitPutGlobalVar(uintptr_t operand, unsigned value);
-        void emitPutClosureVar(unsigned scope, uintptr_t operand, unsigned value);
-
-        void emitInitRegister(unsigned dst);
+        void emitGetClosureVar(int scope, uintptr_t operand);
+        void emitPutGlobalProperty(uintptr_t* operandSlot, int value);
+        void emitPutGlobalVar(uintptr_t operand, int value);
+        void emitPutClosureVar(int scope, uintptr_t operand, int value);
+
+        void emitInitRegister(int dst);
 
         void emitPutIntToCallFrameHeader(RegisterID from, JSStack::CallFrameHeaderEntry);
@@ -813 +813 @@
 #endif
 
-        JSValue getConstantOperand(unsigned src);
-        bool isOperandConstantImmediateInt(unsigned src);
-        bool isOperandConstantImmediateChar(unsigned src);
+        JSValue getConstantOperand(int src);
+        bool isOperandConstantImmediateInt(int src);
+        bool isOperandConstantImmediateChar(int src);
 
         bool atJumpTarget();
@@ -852 +852 @@
 
 #ifndef NDEBUG
-        void printBytecodeOperandTypes(unsigned src1, unsigned src2);
+        void printBytecodeOperandTypes(int src1, int src2);
 #endif