The big Zero deletion

[Gary Benson]

Andrew John Hughes wrote:
> There also seem to be a few minor differences that haven't been
> upstreamed.

There shouldn't be :(
> ports/hotspot/src/./cpu/zero/vm/globals_zero.hpp:
> 
> Has the following differences left.
> 
> (- is IcedTea6, + is OpenJDK6)
> 
> @@ -35,7 +35,6 @@
>  define_pd_global(bool,  UncommonNullCast,     true);
> 
>  define_pd_global(intx,  CodeEntryAlignment,   32);
> -define_pd_global(intx,  OptoLoopAlignment,    16);
>  define_pd_global(intx,  InlineFrequencyCount, 100);
>  define_pd_global(intx,  PreInflateSpin,       10);
> 
> @@ -45,5 +44,3 @@
> 
>  define_pd_global(bool,  RewriteBytecodes,     true);
>  define_pd_global(bool,  RewriteFrequentPairs, true);
> -
> -define_pd_global(intx,  InlineSmallCode,      1000);
> 
> plus old Sun copyright.

We should be able to ignore this one and just use whatever comes from
upstream.  If we're changing things like this to make it build then
presumably that means upstream doesn't build?

> ports/hotspot/src/./cpu/zero/vm/disassembler_zero.hpp:
> 
> Has the following differences left
> 
> +// The disassembler prints out zero code annotated
> +// with Java specific information.
> +
>    static int pd_instruction_alignment() {
> -    return 1;
> +    ShouldNotCallThis();
>    }
> 
>    static const char* pd_cpu_opts() {
> -    return "";
> +    ShouldNotCallThis();

This change is being upstreamed as part of Shark.  It's probably best
to simply ignore this one and just use whatever comes from upstream.
It's only for a not-very-useful debug option that probably nobody even
knows about.

Cheers,
Gary

-- 
http://gbenson.net/