Index: src/ia32/simulator-ia32.h |
diff --git a/src/ia32/simulator-ia32.h b/src/ia32/simulator-ia32.h |
index 94ef7bff974c4870dc9dc30e3758f8f9f3434e83..88d0b6187f1452f991fd41fb0d44708acfcf03a6 100644 |
--- a/src/ia32/simulator-ia32.h |
+++ b/src/ia32/simulator-ia32.h |
@@ -30,10 +30,21 @@ |
#include "allocation.h" |
+namespace v8 { |
+namespace internal { |
+ |
// Since there is no simulator for the ia32 architecture the only thing we can |
// do is to call the entry directly. |
#define CALL_GENERATED_CODE(entry, p0, p1, p2, p3, p4) \ |
- entry(p0, p1, p2, p3, p4); |
+ (entry(p0, p1, p2, p3, p4)) |
+ |
+// Call the generated regexp code directly. The entry function pointer should |
+// expect seven int/pointer sized arguments and return an int. |
+#define CALL_GENERATED_REGEXP_CODE(entry, p0, p1, p2, p3, p4, p5, p6) \ |
+ (entry(p0, p1, p2, p3, p4, p5, p6)) |
+ |
+#define TRY_CATCH_FROM_ADDRESS(try_catch_address) \ |
+ (reinterpret_cast<TryCatch*>(try_catch_address)) |
// The stack limit beyond which we will throw stack overflow errors in |
// generated code. Because generated code on ia32 uses the C stack, we |
@@ -51,12 +62,6 @@ class SimulatorStack : public v8::internal::AllStatic { |
static inline void UnregisterCTryCatch() { } |
}; |
-// Call the generated regexp code directly. The entry function pointer should |
-// expect eight int/pointer sized arguments and return an int. |
-#define CALL_GENERATED_REGEXP_CODE(entry, p0, p1, p2, p3, p4, p5, p6) \ |
- entry(p0, p1, p2, p3, p4, p5, p6) |
- |
-#define TRY_CATCH_FROM_ADDRESS(try_catch_address) \ |
- reinterpret_cast<TryCatch*>(try_catch_address) |
+} } // namespace v8::internal |
#endif // V8_IA32_SIMULATOR_IA32_H_ |