| Index: src/ia32/codegen-ia32.h
|
| ===================================================================
|
| --- src/ia32/codegen-ia32.h (revision 3862)
|
| +++ src/ia32/codegen-ia32.h (working copy)
|
| @@ -659,14 +659,14 @@
|
| GenericBinaryOpStub(Token::Value op,
|
| OverwriteMode mode,
|
| GenericBinaryFlags flags,
|
| - bool only_numbers = false)
|
| + NumberInfo::Type operands_type = NumberInfo::kUnknown)
|
| : op_(op),
|
| mode_(mode),
|
| flags_(flags),
|
| args_in_registers_(false),
|
| args_reversed_(false),
|
| name_(NULL),
|
| - only_numbers_in_stub_(only_numbers) {
|
| + operands_type_(operands_type) {
|
| use_sse3_ = CpuFeatures::IsSupported(SSE3);
|
| ASSERT(OpBits::is_valid(Token::NUM_TOKENS));
|
| }
|
| @@ -691,32 +691,32 @@
|
| bool args_reversed_; // Left and right argument are swapped.
|
| bool use_sse3_;
|
| char* name_;
|
| - bool only_numbers_in_stub_; // Arguments are only numbers.
|
| + NumberInfo::Type operands_type_; // Number type information of operands.
|
|
|
| const char* GetName();
|
|
|
| #ifdef DEBUG
|
| void Print() {
|
| PrintF("GenericBinaryOpStub %d (op %s), "
|
| - "(mode %d, flags %d, registers %d, reversed %d, only_numbers %d)\n",
|
| + "(mode %d, flags %d, registers %d, reversed %d, number_info %s)\n",
|
| MinorKey(),
|
| Token::String(op_),
|
| static_cast<int>(mode_),
|
| static_cast<int>(flags_),
|
| static_cast<int>(args_in_registers_),
|
| static_cast<int>(args_reversed_),
|
| - static_cast<int>(only_numbers_in_stub_));
|
| + NumberInfo::ToString(operands_type_));
|
| }
|
| #endif
|
|
|
| - // Minor key encoding in 16 bits NFRASOOOOOOOOOMM.
|
| + // Minor key encoding in 16 bits NNNFRASOOOOOOOMM.
|
| class ModeBits: public BitField<OverwriteMode, 0, 2> {};
|
| - class OpBits: public BitField<Token::Value, 2, 9> {};
|
| - class SSE3Bits: public BitField<bool, 11, 1> {};
|
| - class ArgsInRegistersBits: public BitField<bool, 12, 1> {};
|
| - class ArgsReversedBits: public BitField<bool, 13, 1> {};
|
| - class FlagBits: public BitField<GenericBinaryFlags, 14, 1> {};
|
| - class OnlyNumbersBits: public BitField<bool, 15, 1> {};
|
| + class OpBits: public BitField<Token::Value, 2, 7> {};
|
| + class SSE3Bits: public BitField<bool, 9, 1> {};
|
| + class ArgsInRegistersBits: public BitField<bool, 10, 1> {};
|
| + class ArgsReversedBits: public BitField<bool, 11, 1> {};
|
| + class FlagBits: public BitField<GenericBinaryFlags, 12, 1> {};
|
| + class NumberInfoBits: public BitField<NumberInfo::Type, 13, 3> {};
|
|
|
| Major MajorKey() { return GenericBinaryOp; }
|
| int MinorKey() {
|
| @@ -727,7 +727,7 @@
|
| | SSE3Bits::encode(use_sse3_)
|
| | ArgsInRegistersBits::encode(args_in_registers_)
|
| | ArgsReversedBits::encode(args_reversed_)
|
| - | OnlyNumbersBits::encode(only_numbers_in_stub_);
|
| + | NumberInfoBits::encode(operands_type_);
|
| }
|
|
|
| void Generate(MacroAssembler* masm);
|
|
|