| Index: runtime/vm/simulator_dbc.h
|
| diff --git a/runtime/vm/simulator_dbc.h b/runtime/vm/simulator_dbc.h
|
| index 4e2f649a45ab70468aaad3dff0181328c086fd26..8acdbce12be9764531661d8a8bc8490fb4bb1983 100644
|
| --- a/runtime/vm/simulator_dbc.h
|
| +++ b/runtime/vm/simulator_dbc.h
|
| @@ -76,12 +76,11 @@ class Simulator {
|
| uword get_pc() const { return reinterpret_cast<uword>(pc_); }
|
|
|
| enum IntrinsicId {
|
| -#define V(test_class_name, test_function_name, enum_name, type, fp) \
|
| - k##enum_name##Intrinsic,
|
| - ALL_INTRINSICS_LIST(V)
|
| - GRAPH_INTRINSICS_LIST(V)
|
| +#define V(test_class_name, test_function_name, enum_name, type, fp) \
|
| + k##enum_name##Intrinsic,
|
| + ALL_INTRINSICS_LIST(V) GRAPH_INTRINSICS_LIST(V)
|
| #undef V
|
| - kIntrinsicCount,
|
| + kIntrinsicCount,
|
| };
|
|
|
| static bool IsSupportedIntrinsic(IntrinsicId id) {
|
| @@ -136,7 +135,8 @@ class Simulator {
|
| RawObject** call_base,
|
| RawObject** top,
|
| uint32_t* pc,
|
| - RawObject** FP, RawObject** SP);
|
| + RawObject** FP,
|
| + RawObject** SP);
|
|
|
| void InstanceCall1(Thread* thread,
|
| RawICData* icdata,
|
| @@ -145,7 +145,8 @@ class Simulator {
|
| RawArray** argdesc,
|
| RawObjectPool** pp,
|
| uint32_t** pc,
|
| - RawObject*** FP, RawObject*** SP,
|
| + RawObject*** FP,
|
| + RawObject*** SP,
|
| bool optimized);
|
|
|
| void InstanceCall2(Thread* thread,
|
| @@ -155,13 +156,12 @@ class Simulator {
|
| RawArray** argdesc,
|
| RawObjectPool** pp,
|
| uint32_t** pc,
|
| - RawObject*** FP, RawObject*** SP,
|
| + RawObject*** FP,
|
| + RawObject*** SP,
|
| bool optimized);
|
|
|
| // Longjmp support for exceptions.
|
| - SimulatorSetjmpBuffer* last_setjmp_buffer() {
|
| - return last_setjmp_buffer_;
|
| - }
|
| + SimulatorSetjmpBuffer* last_setjmp_buffer() { return last_setjmp_buffer_; }
|
| void set_last_setjmp_buffer(SimulatorSetjmpBuffer* buffer) {
|
| last_setjmp_buffer_ = buffer;
|
| }
|
|
|