[aarch64-port-dev ] RFR (S) 8228770: Revert development hsdis changes

[Andrew Dinn]

Hi Aleksey,

On 30/07/2019 12:03, Aleksey Shipilev wrote:
> RFE:
>   https://bugs.openjdk.java.net/browse/JDK-8228770
> 
> Current 8u aarch64-port has changes in hsdis code/config:
> 
> https://builds.shipilev.net/patch-openjdk-jdk8-aarch64/hotspot/src/share/tools/hsdis/Makefile.sdiff.html
> 
> https://builds.shipilev.net/patch-openjdk-jdk8-aarch64/hotspot/src/share/tools/hsdis/hsdis.c.sdiff.html
> 
> I believe these are not needed anymore. We just want to bring the change from staging repo:
>   http://hg.openjdk.java.net/aarch64-port/stage/hotspot/rev/ef43f5719e95
> 
> Full patch:
>   http://cr.openjdk.java.net/~shade/8228770/webrev.01/
> 
> This would leaves us with this change against 8u upstream:
> 
> $ hg diff -r f6fa131b5f40 src/share/tools/
> diff -r f6fa131b5f40 src/share/tools/hsdis/hsdis.c
> --- a/src/share/tools/hsdis/hsdis.c     Thu Jul 11 00:03:29 2019 +0100
> +++ b/src/share/tools/hsdis/hsdis.c     Tue Jul 30 13:02:43 2019 +0200
> @@ -489,10 +489,13 @@
>    res = "sparc:v9b";
>  #endif
>  #if defined(LIBARCH_ppc64) || defined(LIBARCH_ppc64le)
>    res = "powerpc:common64";
>  #endif
> +#ifdef LIBARCH_aarch64
> +  res = "aarch64";
> +#endif
>    if (res == NULL)
>      res = "architecture not set in Makefile!";
>    return res;
>  }
> 
> While most hsdis builds would be with jdk/jdk code, that contains most up-to-date hsdis source, I
> still tried to build it from the 8u aarch64-port tree after this change. It works fine on RHEL with
> binutils 2.32, tested with JMH perfasm and newly built hsdis binary.
> 
> Testing: building hsdis on aarch64, x86_64; adhoc hsdis tests; eyeballing diff against upstream
Yes, that looks good thank you.

regards,


Andrew Dinn
-----------
Senior Principal Software Engineer
Red Hat UK Ltd
Registered in England and Wales under Company Registration No. 03798903
Directors: Michael Cunningham, Michael ("Mike") O'Neill, Eric Shander