8135292: Remove duplicate code in <OS>Address.java in SA

jhuttana · jerboaa · commit ddb55ede2cfb · 2022-06-27T11:52:42.000Z
Reviewed-by: cjplummer, amenkov
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -292,11 +292,6 @@ public Address    xorWithMask(long mask) throws UnsupportedOperationException {
   // Internals only below this point
   //
 
-  long getValue() {
-    return addr;
-  }
-
-
   private static void check(boolean arg, String failMessage) {
     if (!arg) {
       System.err.println(failMessage + ": FAILED");
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -525,7 +525,7 @@ public long readJLong(long address)
     /** From the BsdDebugger interface */
     public long getAddressValue(Address addr) {
       if (addr == null) return 0;
-      return ((BsdAddress) addr).getValue();
+      return addr.asLongValue();
     }
 
     /** From the BsdDebugger interface */
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyAddress.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -279,10 +279,6 @@ public Address    xorWithMask(long mask) throws UnsupportedOperationException {
   // Internals only below this point
   //
 
-  long getValue() {
-    return addr;
-  }
-
   private static void check(boolean arg, String failMessage) {
     if (!arg) {
       System.err.println(failMessage + ": FAILED");
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyDebugger.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/dummy/DummyDebugger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ public Address parseAddress(String addrStr) {
 
   public long getAddressValue(Address addr) {
     if (addr == null) return 0;
-    return ((DummyAddress) addr).getValue();
+    return addr.asLongValue();
   }
 
   public String getOS() {
@@ -142,7 +142,7 @@ String addressToString(DummyAddress addr) {
     if (addr == null) {
       val = "0";
     } else {
-      val = Long.toHexString(addr.getValue());
+      val = Long.toHexString(addr.asLongValue());
     }
     for (int i = 0; i < ((2 * machDesc.getAddressSize()) - val.length()); i++) {
       buf.append('0');
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxAddress.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -293,11 +293,6 @@ public Address    xorWithMask(long mask) throws UnsupportedOperationException {
   // Internals only below this point
   //
 
-  long getValue() {
-    return addr;
-  }
-
-
   private static void check(boolean arg, String failMessage) {
     if (!arg) {
       System.err.println(failMessage + ": FAILED");
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -582,7 +582,7 @@ public long readJLong(long address)
     /** From the LinuxDebugger interface */
     public long getAddressValue(Address addr) {
       if (addr == null) return 0;
-      return ((LinuxAddress) addr).getValue();
+      return addr.asLongValue();
     }
 
     /** From the LinuxDebugger interface */
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcAddress.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/proc/ProcAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -287,11 +287,6 @@ public Address    xorWithMask(long mask) throws UnsupportedOperationException {
   // Internals only below this point
   //
 
-  long getValue() {
-    return addr;
-  }
-
-
   private static void check(boolean arg, String failMessage) {
     if (!arg) {
       System.err.println(failMessage + ": FAILED");
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteAddress.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -285,11 +285,6 @@ public Address    xorWithMask(long mask) throws UnsupportedOperationException {
   // Internals only below this point
   //
 
-  long getValue() {
-    return addr;
-  }
-
-
   private static void check(boolean arg, String failMessage) {
     if (!arg) {
       System.err.println(failMessage + ": FAILED");
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -303,7 +303,7 @@ public String addressValueToString(long addr) {
 
   public long getAddressValue(Address addr) throws DebuggerException {
     if (addr == null) return 0;
-    return ((RemoteAddress) addr).getValue();
+    return addr.asLongValue();
   }
 
   public Address newAddress(long value) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgAddress.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -297,11 +297,6 @@ public Address    xorWithMask(long mask) throws UnsupportedOperationException {
   // Internals only below this point
   //
 
-  long getValue() {
-    return addr;
-  }
-
-
   private static void check(boolean arg, String failMessage) {
     if (!arg) {
       System.err.println(failMessage + ": FAILED");
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -412,7 +412,7 @@ public ClosestSymbol  closestSymbolToPC(Address pcAsAddr) {
   /** From the Debugger interface */
   public long getAddressValue(Address addr) {
     if (addr == null) return 0;
-    return ((WindbgAddress) addr).getValue();
+    return addr.asLongValue();
   }
 
   /** From the WindbgDebugger interface */
@@ -473,7 +473,7 @@ synchronized long lookupByName(String objectName, String symbol) {
     if (dll != null) {
       WindbgAddress addr = (WindbgAddress) dll.lookupSymbol(symbol);
       if (addr != null) {
-        return addr.getValue();
+        return addr.asLongValue();
       }
     }
     return 0L;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -525,7 +525,7 @@ public long readJLong(long address)`
`525`	`525`	`/** From the BsdDebugger interface */`
`526`	`526`	`public long getAddressValue(Address addr) {`
`527`	`527`	`if (addr == null) return 0;`
`528`		`- return ((BsdAddress) addr).getValue();`
	`528`	`+ return addr.asLongValue();`
`529`	`529`	`}`
`530`	`530`
`531`	`531`	`/** From the BsdDebugger interface */`