Rename nklass in x86 code

rkennke · Oct 8, 2024 · 4d7228e · 4d7228e
1 parent f65ef5d
commit 4d7228e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -6477,7 +6477,7 @@ void C2_MacroAssembler::vector_rearrange_int_float(BasicType bt, XMMRegister dst
 }
 
 #ifdef _LP64
-void C2_MacroAssembler::load_nklass_compact_c2(Register dst, Address src) {
+void C2_MacroAssembler::load_narrow_klass_compact_c2(Register dst, Address src) {
   // The incoming address is pointing into obj-start + klass_offset_in_bytes. We need to extract
   // obj-start, so that we can load from the object's mark-word instead. Usually the address
   // comes as obj-start in obj and klass_offset_in_bytes in disp.

diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp
@@ -505,6 +505,6 @@
   void vgather8b_offset(BasicType elem_bt, XMMRegister dst, Register base, Register idx_base,
                               Register offset, Register rtmp, int vlen_enc);
 
-  void load_nklass_compact_c2(Register dst, Address src);
+  void load_narrow_klass_compact_c2(Register dst, Address src);
 
 #endif // CPU_X86_C2_MACROASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -1369,7 +1369,7 @@ int MacroAssembler::ic_check(int end_alignment) {
 
 #ifdef _LP64
   if (UseCompactObjectHeaders) {
-    load_nklass_compact(temp, receiver);
+    load_narrow_klass_compact(temp, receiver);
     cmpl(temp, Address(data, CompiledICData::speculated_klass_offset()));
   } else
 #endif
@@ -5681,7 +5681,7 @@ void MacroAssembler::load_method_holder(Register holder, Register method) {
 }
 
 #ifdef _LP64
-void MacroAssembler::load_nklass_compact(Register dst, Register src) {
+void MacroAssembler::load_narrow_klass_compact(Register dst, Register src) {
   assert(UseCompactObjectHeaders, "expect compact object headers");
   movq(dst, Address(src, oopDesc::mark_offset_in_bytes()));
   shrq(dst, markWord::klass_shift);
@@ -5693,7 +5693,7 @@ void MacroAssembler::load_klass(Register dst, Register src, Register tmp) {
   assert_different_registers(dst, tmp);
 #ifdef _LP64
   if (UseCompactObjectHeaders) {
-    load_nklass_compact(dst, src);
+    load_narrow_klass_compact(dst, src);
     decode_klass_not_null(dst, tmp);
   } else if (UseCompressedClassPointers) {
     movl(dst, Address(src, oopDesc::klass_offset_in_bytes()));
@@ -5723,7 +5723,7 @@ void MacroAssembler::cmp_klass(Register klass, Register obj, Register tmp) {
   if (UseCompactObjectHeaders) {
     assert(tmp != noreg, "need tmp");
     assert_different_registers(klass, obj, tmp);
-    load_nklass_compact(tmp, obj);
+    load_narrow_klass_compact(tmp, obj);
     cmpl(klass, tmp);
   } else if (UseCompressedClassPointers) {
     cmpl(klass, Address(obj, oopDesc::klass_offset_in_bytes()));
@@ -5739,8 +5739,8 @@ void MacroAssembler::cmp_klasses_from_objects(Register obj1, Register obj2, Regi
   if (UseCompactObjectHeaders) {
     assert(tmp2 != noreg, "need tmp2");
     assert_different_registers(obj1, obj2, tmp1, tmp2);
-    load_nklass_compact(tmp1, obj1);
-    load_nklass_compact(tmp2, obj2);
+    load_narrow_klass_compact(tmp1, obj1);
+    load_narrow_klass_compact(tmp2, obj2);
     cmpl(tmp1, tmp2);
   } else if (UseCompressedClassPointers) {
     movl(tmp1, Address(obj1, oopDesc::klass_offset_in_bytes()));

diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -364,7 +364,7 @@ class MacroAssembler: public Assembler {
 
   // oop manipulations
 #ifdef _LP64
-  void load_nklass_compact(Register dst, Register src);
+  void load_narrow_klass_compact(Register dst, Register src);
 #endif
   void load_klass(Register dst, Register src, Register tmp);
   void store_klass(Register dst, Register src, Register tmp);

diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
@@ -4386,9 +4386,9 @@ instruct loadNKlassCompactHeaders(rRegN dst, memory mem, rFlagsReg cr)
   match(Set dst (LoadNKlass mem));
   effect(KILL cr);
   ins_cost(125); // XXX
-  format %{ "load_nklass_compact    $dst, $mem\t# compressed klass ptr" %}
+  format %{ "load_narrow_klass_compact    $dst, $mem\t# compressed klass ptr" %}
   ins_encode %{
-    __ load_nklass_compact_c2($dst$$Register, $mem$$Address);
+    __ load_narrow_klass_compact_c2($dst$$Register, $mem$$Address);
   %}
   ins_pipe(pipe_slow); // XXX
 %}