a 21264 fix, and fix the operator precidence on an and -> zap check (should fix hundreds of test cases

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21302 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 11 insertions, 3 deletions

diff --git a/lib/Target/Alpha/AlphaAsmPrinter.cpp b/lib/Target/Alpha/AlphaAsmPrinter.cpp
index 3e7d5e7bbc..3c1b783b91 100644
--- a/lib/Target/Alpha/AlphaAsmPrinter.cpp
+++ b/lib/Target/Alpha/AlphaAsmPrinter.cpp
@@ -25,9 +25,14 @@
 
 #include "llvm/Support/Mangler.h"
 #include "llvm/ADT/Statistic.h"
+#include "llvm/Support/CommandLine.h"
 
 using namespace llvm;
 
+namespace llvm {
+  extern cl::opt<bool> EnableAlphaFTOI;
+}
+
 namespace {
   Statistic<> EmittedInsts("asm-printer", "Number of machine instrs printed");
 
@@ -229,7 +234,10 @@ void AlphaAsmPrinter::printConstantPool(MachineConstantPool *MCP) {
 bool AlphaAsmPrinter::doInitialization(Module &M)
 {
   AsmPrinter::doInitialization(M);
-  O << "\t.arch ev56\n";
+  if(EnableAlphaFTOI)
+    O << "\t.arch ev6\n";
+  else
+    O << "\t.arch ev56\n";
   return false;
 }
     
diff --git a/lib/Target/Alpha/AlphaISelPattern.cpp b/lib/Target/Alpha/AlphaISelPattern.cpp
index e594c8664a..18cc35a356 100644
--- a/lib/Target/Alpha/AlphaISelPattern.cpp
+++ b/lib/Target/Alpha/AlphaISelPattern.cpp
@@ -1695,9 +1695,9 @@ unsigned ISel::SelectExpr(SDOperand N) {
       unsigned int build = 0;
       for(int i = 0; i < 8; ++i)
       {
-        if (k & 0xFF == 0xFF)
+        if ((k & 0x00FF) == 0x00FF)
           build |= 1 << i;
-        else if (k & 0xFF != 0)
+        else if ((k & 0x00FF) != 0)
         { build = 0; break; }
         k >>= 8;
       }