1.1 --- a/src/cpu/x86/vm/assembler_x86.hpp Thu Mar 19 09:13:24 2009 -0700
1.2 +++ b/src/cpu/x86/vm/assembler_x86.hpp Fri Mar 20 23:19:36 2009 -0700
1.3 @@ -212,7 +212,7 @@
1.4 "inconsistent address");
1.5 }
1.6
1.7 - Address(Register base, RegisterConstant index, ScaleFactor scale = times_1, int disp = 0)
1.8 + Address(Register base, RegisterOrConstant index, ScaleFactor scale = times_1, int disp = 0)
1.9 : _base (base),
1.10 _index(index.register_or_noreg()),
1.11 _scale(scale),
1.12 @@ -256,7 +256,7 @@
1.13 "inconsistent address");
1.14 }
1.15
1.16 - Address(Register base, RegisterConstant index, ScaleFactor scale, ByteSize disp)
1.17 + Address(Register base, RegisterOrConstant index, ScaleFactor scale, ByteSize disp)
1.18 : _base (base),
1.19 _index(index.register_or_noreg()),
1.20 _scale(scale),
1.21 @@ -1802,7 +1802,7 @@
1.22 // interface method calling
1.23 void lookup_interface_method(Register recv_klass,
1.24 Register intf_klass,
1.25 - RegisterConstant itable_index,
1.26 + RegisterOrConstant itable_index,
1.27 Register method_result,
1.28 Register scan_temp,
1.29 Label& no_such_interface);
1.30 @@ -1819,7 +1819,7 @@
1.31 Label* L_success,
1.32 Label* L_failure,
1.33 Label* L_slow_path,
1.34 - RegisterConstant super_check_offset = RegisterConstant(-1));
1.35 + RegisterOrConstant super_check_offset = RegisterOrConstant(-1));
1.36
1.37 // The rest of the type check; must be wired to a corresponding fast path.
1.38 // It does not repeat the fast path logic, so don't use it standalone.
1.39 @@ -1883,9 +1883,9 @@
1.40 // stack overflow + shadow pages. Also, clobbers tmp
1.41 void bang_stack_size(Register size, Register tmp);
1.42
1.43 - virtual RegisterConstant delayed_value(intptr_t* delayed_value_addr,
1.44 - Register tmp,
1.45 - int offset);
1.46 + virtual RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr,
1.47 + Register tmp,
1.48 + int offset);
1.49
1.50 // Support for serializing memory accesses between threads
1.51 void serialize_memory(Register thread, Register tmp);
