# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1366373182 -7200
# Node ID cdd10396f2ad04d923627f0cfbc4de2876af90e2
# Parent  c8f4e1081c0b37d7681bd1b7361d87fa2a5328cf# Parent  50d87c79f83181eaf2865d7d47508da1608c7644
Merge.

diff -r c8f4e1081c0b -r cdd10396f2ad 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	Fri Apr 19 14:05:55 2013 +0200
+++ b/graal/com.oracle.graal.amd64/src/com/oracle/graal/amd64/AMD64.java	Fri Apr 19 14:06:22 2013 +0200
@@ -106,10 +106,10 @@
         rip
     };
 
-    private final int useSSE;
-    private final int useAVX;
+    private final int supportedSSEVersion;
+    private final int supportedAVXVersion;
 
-    public AMD64(int useSSE, int useAVX) {
+    public AMD64(int supportedSSEVersion, int supportedAVXVersion) {
         super("AMD64",
               8,
               ByteOrder.LITTLE_ENDIAN,
@@ -118,15 +118,15 @@
               1,
               r15.encoding + 1,
               8);
-        assert useSSE >= 2;
-        this.useSSE = useSSE;
-        this.useAVX = useAVX;
+        assert supportedSSEVersion >= 2;
+        this.supportedSSEVersion = supportedSSEVersion;
+        this.supportedAVXVersion = supportedAVXVersion;
     }
     // @formatter:on
 
     @Override
     public int getMaxVectorLength(Kind kind) {
-        if (useAVX > 0) {
+        if (supportedAVXVersion > 0) {
             switch (kind) {
                 case Boolean:
                     return 32;
@@ -172,11 +172,11 @@
         return 1;
     }
 
-    public int getSSE() {
-        return useSSE;
+    public int getSupportedSSEVersion() {
+        return supportedSSEVersion;
     }
 
-    public int getAVX() {
-        return useAVX;
+    public int getSupportedAVXVersion() {
+        return supportedAVXVersion;
     }
 }