Index: src/compiler/instruction.h |
diff --git a/src/compiler/instruction.h b/src/compiler/instruction.h |
index 3a82c112e7c73542a83b384042504fc8a565ade5..1a323a490a8ee0b10e5de8036205a8003a23254e 100644 |
--- a/src/compiler/instruction.h |
+++ b/src/compiler/instruction.h |
@@ -16,8 +16,6 @@ |
#include "src/compiler/opcodes.h" |
#include "src/compiler/schedule.h" |
#include "src/compiler/source-position.h" |
-// TODO(titzer): don't include the macro-assembler? |
-#include "src/macro-assembler.h" |
#include "src/zone-allocator.h" |
namespace v8 { |
@@ -32,14 +30,18 @@ const InstructionCode kGapInstruction = -1; |
const InstructionCode kBlockStartInstruction = -2; |
const InstructionCode kSourcePositionInstruction = -3; |
+// Platform independent maxes. |
+static const int kMaxGeneralRegisters = 32; |
+static const int kMaxDoubleRegisters = 32; |
-#define INSTRUCTION_OPERAND_LIST(V) \ |
- V(Constant, CONSTANT, 0) \ |
- V(Immediate, IMMEDIATE, 0) \ |
- V(StackSlot, STACK_SLOT, 128) \ |
- V(DoubleStackSlot, DOUBLE_STACK_SLOT, 128) \ |
- V(Register, REGISTER, Register::kNumRegisters) \ |
- V(DoubleRegister, DOUBLE_REGISTER, DoubleRegister::kMaxNumRegisters) |
+ |
+#define INSTRUCTION_OPERAND_LIST(V) \ |
+ V(Constant, CONSTANT, 0) \ |
+ V(Immediate, IMMEDIATE, 0) \ |
+ V(StackSlot, STACK_SLOT, 128) \ |
+ V(DoubleStackSlot, DOUBLE_STACK_SLOT, 128) \ |
+ V(Register, REGISTER, kMaxGeneralRegisters) \ |
+ V(DoubleRegister, DOUBLE_REGISTER, kMaxDoubleRegisters) |
class InstructionOperand : public ZoneObject { |
public: |