1.1 --- a/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -157,7 +157,7 @@
1.11 movptr(Address(obj, oopDesc::mark_offset_in_bytes ()), (int32_t)(intptr_t)markOopDesc::prototype());
1.12 }
1.13 #ifdef _LP64
1.14 - if (UseCompressedOops) { // Take care not to kill klass
1.15 + if (UseCompressedKlassPointers) { // Take care not to kill klass
1.16 movptr(t1, klass);
1.17 encode_heap_oop_not_null(t1);
1.18 movl(Address(obj, oopDesc::klass_offset_in_bytes()), t1);
1.19 @@ -171,7 +171,7 @@
1.20 movl(Address(obj, arrayOopDesc::length_offset_in_bytes()), len);
1.21 }
1.22 #ifdef _LP64
1.23 - else if (UseCompressedOops) {
1.24 + else if (UseCompressedKlassPointers) {
1.25 xorptr(t1, t1);
1.26 store_klass_gap(obj, t1);
1.27 }
1.28 @@ -334,7 +334,7 @@
1.29 assert(!MacroAssembler::needs_explicit_null_check(oopDesc::klass_offset_in_bytes()), "must add explicit null check");
1.30 int start_offset = offset();
1.31
1.32 - if (UseCompressedOops) {
1.33 + if (UseCompressedKlassPointers) {
1.34 load_klass(rscratch1, receiver);
1.35 cmpptr(rscratch1, iCache);
1.36 } else {
1.37 @@ -345,7 +345,7 @@
1.38 jump_cc(Assembler::notEqual,
1.39 RuntimeAddress(SharedRuntime::get_ic_miss_stub()));
1.40 const int ic_cmp_size = LP64_ONLY(10) NOT_LP64(9);
1.41 - assert(UseCompressedOops || offset() - start_offset == ic_cmp_size, "check alignment in emit_method_entry");
1.42 + assert(UseCompressedKlassPointers || offset() - start_offset == ic_cmp_size, "check alignment in emit_method_entry");
1.43 }
1.44
1.45
