# HG changeset patch # User Christian Wimmer # Date 1359992195 28800 # Node ID 627c284671b76804c6d4b7f162ef93c1c931d402 # Parent 20cc221ed5cac8dbc5aa9aeb222816a09e2f6bd8 Use java.nio.ByteOrder instead of our own ByteOrder enumeration diff -r 20cc221ed5ca -r 627c284671b7 graal/com.oracle.graal.amd64/src/com/oracle/graal/amd64/AMD64.java --- a/graal/com.oracle.graal.amd64/src/com/oracle/graal/amd64/AMD64.java Mon Feb 04 06:31:27 2013 -0800 +++ b/graal/com.oracle.graal.amd64/src/com/oracle/graal/amd64/AMD64.java Mon Feb 04 07:36:35 2013 -0800 @@ -26,6 +26,8 @@ import static com.oracle.graal.api.code.Register.RegisterFlag.*; import static com.oracle.graal.api.meta.Kind.*; +import java.nio.*; + import com.oracle.graal.api.code.*; import com.oracle.graal.api.code.Register.*; @@ -109,7 +111,7 @@ public AMD64() { super("AMD64", 8, - ByteOrder.LittleEndian, + ByteOrder.LITTLE_ENDIAN, allRegisters, LOAD_STORE | STORE_STORE, 1, diff -r 20cc221ed5ca -r 627c284671b7 graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Architecture.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Architecture.java Mon Feb 04 06:31:27 2013 -0800 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Architecture.java Mon Feb 04 07:36:35 2013 -0800 @@ -22,9 +22,10 @@ */ package com.oracle.graal.api.code; +import java.nio.*; import java.util.*; -import com.oracle.graal.api.code.Register.*; +import com.oracle.graal.api.code.Register.RegisterFlag; /** * Represents a CPU architecture, including information such as its endianness, CPU registers, word @@ -33,13 +34,6 @@ public abstract class Architecture { /** - * The endianness of the architecture. - */ - public static enum ByteOrder { - LittleEndian, BigEndian - } - - /** * The number of bits required in a bit map covering all the registers that may store * references. The bit position of a register in the map is the register's * {@linkplain Register#number number}. diff -r 20cc221ed5ca -r 627c284671b7 graal/com.oracle.graal.asm/src/com/oracle/graal/asm/AbstractAssembler.java --- a/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/AbstractAssembler.java Mon Feb 04 06:31:27 2013 -0800 +++ b/graal/com.oracle.graal.asm/src/com/oracle/graal/asm/AbstractAssembler.java Mon Feb 04 07:36:35 2013 -0800 @@ -22,8 +22,9 @@ */ package com.oracle.graal.asm; +import java.nio.*; + import com.oracle.graal.api.code.*; -import com.oracle.graal.api.code.Architecture.*; /** * The platform-independent base class for the assembler. @@ -36,7 +37,7 @@ public AbstractAssembler(TargetDescription target) { this.target = target; - if (target.arch.getByteOrder() == ByteOrder.BigEndian) { + if (target.arch.getByteOrder() == ByteOrder.BIG_ENDIAN) { this.codeBuffer = new Buffer.BigEndian(); } else { this.codeBuffer = new Buffer.LittleEndian();