Chromium Code Reviews| Index: src/arm/assembler-arm.h |
| =================================================================== |
| --- src/arm/assembler-arm.h (revision 5854) |
| +++ src/arm/assembler-arm.h (working copy) |
| @@ -1079,8 +1079,18 @@ |
| const Condition cond = al); |
| // Pseudo instructions |
| - void nop(int type = 0); |
| + // Different nop operations are used by the code generator to detect certain |
| + // states of the generated code. |
| + enum NopMarkerTypes { |
|
Søren Thygesen Gjesse
2010/11/19 09:08:47
I think this enum should be moved to the macro-ass
Alexandre
2010/11/23 11:23:21
Left here as discussed.
Moving this to the Masm wa
|
| + NON_MARKING_NOP = 0, |
| + PROPERTY_ACCESS_INLINED, |
| + PROPERTY_ACCESS_INLINED_CONTEXT, |
| + DEBUG_BREAK_NOP |
| + }; |
| + |
| + void nop(NopMarkerTypes type = NON_MARKING_NOP); |
| + |
| void push(Register src, Condition cond = al) { |
| str(src, MemOperand(sp, 4, NegPreIndex), cond); |
| } |
| @@ -1151,7 +1161,7 @@ |
| static void instr_at_put(byte* pc, Instr instr) { |
| *reinterpret_cast<Instr*>(pc) = instr; |
| } |
| - static bool IsNop(Instr instr, int type = 0); |
| + static bool IsNop(Instr instr, NopMarkerTypes = NON_MARKING_NOP); |
| static bool IsBranch(Instr instr); |
| static int GetBranchOffset(Instr instr); |
| static bool IsLdrRegisterImmediate(Instr instr); |
| @@ -1168,6 +1178,7 @@ |
| static bool IsLdrRegFpOffset(Instr instr); |
| static bool IsStrRegFpNegOffset(Instr instr); |
| static bool IsLdrRegFpNegOffset(Instr instr); |
| + static bool IsLdrPcImmediateOffset(Instr instr); |
| protected: |