Skip to content

Commit 87eb39b

Browse files
mur47x111mur47x111
committed
Audit Graal code for JDK-8353192: C2: Clean up x86 backend after 32-bit x86 removal
1 parent 9d54d1a commit 87eb39b

11 files changed

+21
-21
lines changed

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/z/AMD64HotSpotZBarrierSetLIRGenerator.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ public static void zUncolor(CompilationResultBuilder crb, AMD64MacroAssembler ma
131131
* Emit the full store barrier with a fast path, and an out of line medium path with a final
132132
* slow path call to the runtime.
133133
*/
134-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L302-L319", sha1 = "9a628c1771df79ae8b4cee89d2863fbd4a4964bc")
135-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L372-L416", sha1 = "7688e7aeab5f1aa413690066355a17c18a4273fa")
134+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L303-L320", sha1 = "9a628c1771df79ae8b4cee89d2863fbd4a4964bc")
135+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L373-L417", sha1 = "7688e7aeab5f1aa413690066355a17c18a4273fa")
136136
public static void emitPreWriteBarrier(CompilationResultBuilder crb,
137137
AMD64MacroAssembler masm,
138138
LIRInstruction op,
@@ -208,7 +208,7 @@ public static void emitPreWriteBarrier(CompilationResultBuilder crb,
208208
/**
209209
* Try to perform any local store barrier fixups or dispatch to the slow path.
210210
*/
211-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L452-L507", sha1 = "4b729acf92e6a297229b7f1e957601708c315f4f")
211+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L453-L508", sha1 = "4b729acf92e6a297229b7f1e957601708c315f4f")
212212
static void storeBarrierMedium(CompilationResultBuilder crb,
213213
AMD64MacroAssembler masm,
214214
AMD64Address address,
@@ -273,7 +273,7 @@ static void storeBarrierMedium(CompilationResultBuilder crb,
273273
/**
274274
* Add a value to the store buffer.
275275
*/
276-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L418-L450", sha1 = "638b10c65bb14fa4b254efa4d5bbb1751fdbb6bf")
276+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp#L419-L451", sha1 = "638b10c65bb14fa4b254efa4d5bbb1751fdbb6bf")
277277
static void storeBarrierBufferAdd(AMD64MacroAssembler masm,
278278
AMD64Address address,
279279
Register tmp1,

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotHashCodeSnippets.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import jdk.graal.compiler.word.Word;
4646

4747
// @formatter:off
48-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/share/opto/library_call.cpp#L4662-L4796",
48+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/share/opto/library_call.cpp#L4667-L4801",
4949
sha1 = "c212d1dbff26d02d4d749e085263d4104895f1ba")
5050
// @formatter:on
5151
public class HotSpotHashCodeSnippets extends IdentityHashCodeSnippets {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/MonitorSnippets.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@
211211
* appropriately to comply with the layouts above.
212212
*/
213213
// @formatter:off
214-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/03105fc92505e9e367354e763b99cbe02bf473d6/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L172-L493",
215-
sha1 = "eeccf08eec0f427f9056a88620ff3f53ab8c189c")
214+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L157-L463",
215+
sha1 = "223a88b7bdd10862cd3b112181e1d17682b0fbe2")
216216
// @formatter:on
217217
public class MonitorSnippets implements Snippets {
218218

@@ -445,8 +445,8 @@ private static boolean tryStackLocking(Object object, Word lock, Word mark, Word
445445
}
446446

447447
// @formatter:off
448-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/03105fc92505e9e367354e763b99cbe02bf473d6/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L495-L661",
449-
sha1 = "1c396a67926e92a2cbc64c27fe667142e9ec157d")
448+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L465-L625",
449+
sha1 = "1fb0a66183a752797b07a39526a981f2a89f5044")
450450
// @formatter:on
451451
@SuppressWarnings("unused")
452452
private static boolean tryLightweightLocking(Object object, Word lock, Word mark, Word thread, boolean trace, Counters counters, Register stackPointerRegister) {
@@ -573,8 +573,8 @@ private static boolean tryStackUnlocking(Object object, Word thread, Word lock,
573573
}
574574

575575
// @formatter:off
576-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/03105fc92505e9e367354e763b99cbe02bf473d6/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L663-L830",
577-
sha1 = "ad63b9816f3e1851c7defe445488b49dd49e69d6")
576+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L627-L788",
577+
sha1 = "e88d7b8c4bb85358c6a810ee1d7d92fde5db42e6")
578578
// @formatter:on
579579
private static boolean tryLightweightUnlocking(Object object, Word thread, Word lock, boolean trace, Counters counters) {
580580
// Load top

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerMulAddOp.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
// @formatter:off
6060
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp#L3378-L3431",
6161
sha1 = "fab3e655909df456c2fc5a065f98aa62aac0bc08")
62-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L7837-L7871",
62+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L7839-L7873",
6363
sha1 = "e68b8c7bdb37d4bd1350c7e1219fdcb419d2618a")
64-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L8089-L8266",
64+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L8091-L8268",
6565
sha1 = "d89ad721deb560178359f86e8c6c96ffc6530878")
6666
// @formatter:on
6767
public final class AMD64BigIntegerMulAddOp extends AMD64LIRInstruction {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
// @formatter:off
5959
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp#L3143-L3199",
6060
sha1 = "bb78557c95005fea278c78ad114bfdc8e256151a")
61-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L7093-L7550",
61+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L7095-L7552",
6262
sha1 = "0763af542cf9f40a1c542e4834a67fc4b2c74e1c")
6363
// @formatter:on
6464
public final class AMD64BigIntegerMultiplyToLenOp extends AMD64LIRInstruction {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerSquareToLenOp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
// @formatter:off
5858
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp#L3254-L3299",
5959
sha1 = "b002fbc3aef7b27914cb3dbf66e27e94ffc2d8d9")
60-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L7774-L8087",
60+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L7776-L8089",
6161
sha1 = "2e4ea1436904cbd5a933eb8c687296d9bbefe4f0")
6262
// @formatter:on
6363
public final class AMD64BigIntegerSquareToLenOp extends AMD64LIRInstruction {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CountPositivesOp.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
import jdk.vm.ci.meta.Value;
5656

5757
// @formatter:off
58-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/03105fc92505e9e367354e763b99cbe02bf473d6/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L4075-L4345",
59-
sha1 = "684b5353c58bbf92e4403aa985113a78a1f38930")
58+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp#L4020-L4263",
59+
sha1 = "42324f1b52b9bd5c316ebd916af9277f50d91f5b")
6060
// @formatter:on
6161
@Opcode("AMD64_COUNT_POSITIVES")
6262
public final class AMD64CountPositivesOp extends AMD64ComplexVectorOp {

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64EncodeArrayOp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
import jdk.vm.ci.meta.Value;
5555

5656
// @formatter:off
57-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L6932-L7090",
57+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L6934-L7092",
5858
sha1 = "90e15d79705bc87ffbefbcaa4bdfa55123c12aba")
5959
// @formatter:on
6060
@Opcode("AMD64_ENCODE_ARRAY")

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64RoundFloatToIntegerOp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
* {@link Math#round} algorithm for details.
4747
*/
4848
// @formatter:off
49-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L10527-L10623",
49+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L10529-L10625",
5050
sha1 = "9e13c7375bbb35809ad79ebd6a9cc19e66f57aa1")
5151
@SyncPort(from = "https://github.com/openjdk/jdk/blob/de29ef3bf3a029f99f340de9f093cd20544217fd/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp#L596-L767",
5252
sha1 = "3b5a811373c3fc9555f9fac0253b5a3a3d094223")

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64StringUTF16CompressOp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import jdk.vm.ci.meta.Value;
6060

6161
// @formatter:off
62-
@SyncPort(from = "https://github.com/openjdk/jdk/blob/9a3f9997b68a1f64e53b9711b878fb073c3c9b90/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L9346-L9554",
62+
@SyncPort(from = "https://github.com/openjdk/jdk/blob/250eb743c112fbcc45bf2b3ded1c644b19893577/src/hotspot/cpu/x86/macroAssembler_x86.cpp#L9348-L9556",
6363
sha1 = "3e365037f473204b3f742ab364bd9ad514e72161")
6464
// @formatter:on
6565
@Opcode("AMD64_STRING_COMPRESS")

0 commit comments

Comments
 (0)