Simplify some uses of utohexstr.
authorBenjamin Kramer <benny.kra@googlemail.com>
Mon, 7 Nov 2011 21:00:59 +0000 (21:00 +0000)
committerBenjamin Kramer <benny.kra@googlemail.com>
Mon, 7 Nov 2011 21:00:59 +0000 (21:00 +0000)
As a side effect hex is printed lowercase instead of uppercase now.

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

lib/MC/MCDwarf.cpp
lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp
lib/Target/MBlaze/MBlazeAsmPrinter.cpp
test/CodeGen/ARM/reg_sequence.ll
test/CodeGen/ARM/vmov.ll
test/MC/ARM/neon-bitwise-encoding.s
test/MC/ARM/neon-mov-encoding.s
test/MC/ARM/neont2-mov-encoding.s
test/MC/Disassembler/ARM/neon-tests.txt
test/MC/Disassembler/ARM/neon.txt
test/MC/Disassembler/ARM/neont2.txt

index 4658a3093fab369ea8e91d7fb22c2ff2764c9140..49828080e01e1fb208accdbf6be6d8c88e2377a6 100644 (file)
@@ -21,7 +21,6 @@
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/Twine.h"
 using namespace llvm;
 
@@ -738,8 +737,8 @@ bool FrameEmitterImpl::EmitCompactUnwind(MCStreamer &Streamer,
 
   // Compact Encoding
   Size = getSizeForEncoding(Streamer, dwarf::DW_EH_PE_udata4);
-  if (VerboseAsm) Streamer.AddComment(Twine("Compact Unwind Encoding: 0x") +
-                                      Twine(llvm::utohexstr(Encoding)));
+  if (VerboseAsm) Streamer.AddComment("Compact Unwind Encoding: 0x" +
+                                      Twine::utohexstr(Encoding));
   Streamer.EmitIntValue(Encoding, Size);
 
 
index 844e3ab1778b2bee2e74ad02ddd2b6bbabd58281..6c6c02146fa6b8300397b42df66d71f85b062c33 100644 (file)
@@ -18,7 +18,6 @@
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCExpr.h"
-#include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace llvm;
 
@@ -967,7 +966,8 @@ void ARMInstPrinter::printNEONModImmOperand(const MCInst *MI, unsigned OpNum,
   unsigned EncodedImm = MI->getOperand(OpNum).getImm();
   unsigned EltBits;
   uint64_t Val = ARM_AM::decodeNEONModImm(EncodedImm, EltBits);
-  O << "#0x" << utohexstr(Val);
+  O << "#0x";
+  O.write_hex(Val);
 }
 
 void ARMInstPrinter::printImmPlusOneOperand(const MCInst *MI, unsigned OpNum,
index 97bd083fdd15862ca74942f0c9bf12bedbc96e4d..ff051e331f93f7a17a7922f3616f2dd3eabd34a3 100644 (file)
@@ -39,7 +39,6 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/raw_ostream.h"
@@ -119,7 +118,7 @@ namespace {
 static void printHex32(unsigned int Value, raw_ostream &O) {
   O << "0x";
   for (int i = 7; i >= 0; i--)
-    O << utohexstr((Value & (0xF << (i*4))) >> (i*4));
+    O.write_hex((Value & (0xF << (i*4))) >> (i*4));
 }
 
 // Create a bitmask with all callee saved registers for CPU or Floating Point
index 3a19211112802c0b543ba7642b3c95b92eb24977..091a003ef9ccab5fa56abbb5bf64bc23616333de 100644 (file)
@@ -272,7 +272,7 @@ define arm_aapcs_vfpcc float @t9(%0* nocapture, %3* nocapture) nounwind {
 define arm_aapcs_vfpcc i32 @t10() nounwind {
 entry:
 ; CHECK: t10:
-; CHECK: vmov.i32 q[[Q0:[0-9]+]], #0x3F000000
+; CHECK: vmov.i32 q[[Q0:[0-9]+]], #0x3f000000
 ; CHECK: vmul.f32 q8, q8, d0[0]
 ; CHECK: vadd.f32 q8, q8, q8
   %0 = shufflevector <4 x float> zeroinitializer, <4 x float> undef, <4 x i32> zeroinitializer ; <<4 x float>> [#uses=1]
index a86be32bd203222135e9d14095f8af8c640324eb..ab56e5bb29904181dd04d18d42e584bd373cbce5 100644 (file)
@@ -56,13 +56,13 @@ define <2 x i32> @v_movi32d() nounwind {
 
 define <2 x i32> @v_movi32e() nounwind {
 ;CHECK: v_movi32e:
-;CHECK: vmov.i32 d{{.*}}, #0x20FF
+;CHECK: vmov.i32 d{{.*}}, #0x20ff
        ret <2 x i32> < i32 8447, i32 8447 >
 }
 
 define <2 x i32> @v_movi32f() nounwind {
 ;CHECK: v_movi32f:
-;CHECK: vmov.i32 d{{.*}}, #0x20FFFF
+;CHECK: vmov.i32 d{{.*}}, #0x20ffff
        ret <2 x i32> < i32 2162687, i32 2162687 >
 }
 
@@ -92,19 +92,19 @@ define <2 x i32> @v_mvni32d() nounwind {
 
 define <2 x i32> @v_mvni32e() nounwind {
 ;CHECK: v_mvni32e:
-;CHECK: vmvn.i32 d{{.*}}, #0x20FF
+;CHECK: vmvn.i32 d{{.*}}, #0x20ff
        ret <2 x i32> < i32 4294958848, i32 4294958848 >
 }
 
 define <2 x i32> @v_mvni32f() nounwind {
 ;CHECK: v_mvni32f:
-;CHECK: vmvn.i32 d{{.*}}, #0x20FFFF
+;CHECK: vmvn.i32 d{{.*}}, #0x20ffff
        ret <2 x i32> < i32 4292804608, i32 4292804608 >
 }
 
 define <1 x i64> @v_movi64() nounwind {
 ;CHECK: v_movi64:
-;CHECK: vmov.i64 d{{.*}}, #0xFF0000FF0000FFFF
+;CHECK: vmov.i64 d{{.*}}, #0xff0000ff0000ffff
        ret <1 x i64> < i64 18374687574888349695 >
 }
 
@@ -152,19 +152,19 @@ define <4 x i32> @v_movQi32d() nounwind {
 
 define <4 x i32> @v_movQi32e() nounwind {
 ;CHECK: v_movQi32e:
-;CHECK: vmov.i32 q{{.*}}, #0x20FF
+;CHECK: vmov.i32 q{{.*}}, #0x20ff
        ret <4 x i32> < i32 8447, i32 8447, i32 8447, i32 8447 >
 }
 
 define <4 x i32> @v_movQi32f() nounwind {
 ;CHECK: v_movQi32f:
-;CHECK: vmov.i32 q{{.*}}, #0x20FFFF
+;CHECK: vmov.i32 q{{.*}}, #0x20ffff
        ret <4 x i32> < i32 2162687, i32 2162687, i32 2162687, i32 2162687 >
 }
 
 define <2 x i64> @v_movQi64() nounwind {
 ;CHECK: v_movQi64:
-;CHECK: vmov.i64 q{{.*}}, #0xFF0000FF0000FFFF
+;CHECK: vmov.i64 q{{.*}}, #0xff0000ff0000ffff
        ret <2 x i64> < i64 18374687574888349695, i64 18374687574888349695 >
 }
 
@@ -182,7 +182,7 @@ entry:
 define void @vdupnneg75(%struct.int8x8_t* noalias nocapture sret %agg.result) nounwind {
 entry:
 ;CHECK: vdupnneg75:
-;CHECK: vmov.i8 d{{.*}}, #0xB5
+;CHECK: vmov.i8 d{{.*}}, #0xb5
   %0 = getelementptr inbounds %struct.int8x8_t* %agg.result, i32 0, i32 0 ; <<8 x i8>*> [#uses=1]
   store <8 x i8> <i8 -75, i8 -75, i8 -75, i8 -75, i8 -75, i8 -75, i8 -75, i8 -75>, <8 x i8>* %0, align 8
   ret void
index bcf647c926688e5dd5c3d29798b4b99ed37fdb17..72d025629024e36fb7a1bdff58a82d98e7cf8bd1 100644 (file)
@@ -33,8 +33,8 @@
 
 @ CHECK: vbic  d16, d17, d16           @ encoding: [0xb0,0x01,0x51,0xf2]
 @ CHECK: vbic  q8, q8, q9              @ encoding: [0xf2,0x01,0x50,0xf2]
-@ CHECK: vbic.i32      d16, #0xFF000000 @ encoding: [0x3f,0x07,0xc7,0xf3]
-@ CHECK: vbic.i32      q8, #0xFF000000 @ encoding: [0x7f,0x07,0xc7,0xf3]
+@ CHECK: vbic.i32      d16, #0xff000000 @ encoding: [0x3f,0x07,0xc7,0xf3]
+@ CHECK: vbic.i32      q8, #0xff000000 @ encoding: [0x7f,0x07,0xc7,0xf3]
 
        vorn    d16, d17, d16
        vorn    q8, q8, q9
index 2e330039cad4e991ebef33407b75b08954783889..6f26a13c3ea96928cec4895893a767fb48264152 100644 (file)
@@ -18,9 +18,9 @@
 @ CHECK: vmov.i32      d16, #0x2000    @ encoding: [0x10,0x02,0xc2,0xf2]
 @ CHECK: vmov.i32      d16, #0x200000  @ encoding: [0x10,0x04,0xc2,0xf2]
 @ CHECK: vmov.i32      d16, #0x20000000 @ encoding: [0x10,0x06,0xc2,0xf2]
-@ CHECK: vmov.i32      d16, #0x20FF    @ encoding: [0x10,0x0c,0xc2,0xf2]
-@ CHECK: vmov.i32      d16, #0x20FFFF  @ encoding: [0x10,0x0d,0xc2,0xf2]
-@ CHECK: vmov.i64 d16, #0xFF0000FF0000FFFF @ encoding: [0x33,0x0e,0xc1,0xf3]
+@ CHECK: vmov.i32      d16, #0x20ff    @ encoding: [0x10,0x0c,0xc2,0xf2]
+@ CHECK: vmov.i32      d16, #0x20ffff  @ encoding: [0x10,0x0d,0xc2,0xf2]
+@ CHECK: vmov.i64 d16, #0xff0000ff0000ffff @ encoding: [0x33,0x0e,0xc1,0xf3]
 
 
 
@@ -42,9 +42,9 @@
 @ CHECK: vmov.i32      q8, #0x2000     @ encoding: [0x50,0x02,0xc2,0xf2]
 @ CHECK: vmov.i32      q8, #0x200000   @ encoding: [0x50,0x04,0xc2,0xf2]
 @ CHECK: vmov.i32      q8, #0x20000000 @ encoding: [0x50,0x06,0xc2,0xf2]
-@ CHECK: vmov.i32      q8, #0x20FF     @ encoding: [0x50,0x0c,0xc2,0xf2]
-@ CHECK: vmov.i32      q8, #0x20FFFF   @ encoding: [0x50,0x0d,0xc2,0xf2]
-@ CHECK: vmov.i64 q8, #0xFF0000FF0000FFFF @ encoding: [0x73,0x0e,0xc1,0xf3]
+@ CHECK: vmov.i32      q8, #0x20ff     @ encoding: [0x50,0x0c,0xc2,0xf2]
+@ CHECK: vmov.i32      q8, #0x20ffff   @ encoding: [0x50,0x0d,0xc2,0xf2]
+@ CHECK: vmov.i64 q8, #0xff0000ff0000ffff @ encoding: [0x73,0x0e,0xc1,0xf3]
 
        vmvn.i16        d16, #0x10
        vmvn.i16        d16, #0x1000
@@ -61,8 +61,8 @@
 @ CHECK: vmvn.i32      d16, #0x2000    @ encoding: [0x30,0x02,0xc2,0xf2]
 @ CHECK: vmvn.i32      d16, #0x200000  @ encoding: [0x30,0x04,0xc2,0xf2]
 @ CHECK: vmvn.i32      d16, #0x20000000 @ encoding: [0x30,0x06,0xc2,0xf2]
-@ CHECK: vmvn.i32      d16, #0x20FF    @ encoding: [0x30,0x0c,0xc2,0xf2]
-@ CHECK: vmvn.i32      d16, #0x20FFFF  @ encoding: [0x30,0x0d,0xc2,0xf2]
+@ CHECK: vmvn.i32      d16, #0x20ff    @ encoding: [0x30,0x0c,0xc2,0xf2]
+@ CHECK: vmvn.i32      d16, #0x20ffff  @ encoding: [0x30,0x0d,0xc2,0xf2]
 
        vmovl.s8        q8, d16
        vmovl.s16       q8, d16
index 2d03479b8ac62b24d93ca95ba52fc536b32cbab7..43df3498cb5b475dbc7c13550178ec02f793b338 100644 (file)
@@ -20,9 +20,9 @@
 @ CHECK: vmov.i32      d16, #0x2000    @ encoding: [0xc2,0xef,0x10,0x02]
 @ CHECK: vmov.i32      d16, #0x200000  @ encoding: [0xc2,0xef,0x10,0x04]
 @ CHECK: vmov.i32      d16, #0x20000000 @ encoding: [0xc2,0xef,0x10,0x06]
-@ CHECK: vmov.i32      d16, #0x20FF    @ encoding: [0xc2,0xef,0x10,0x0c]
-@ CHECK: vmov.i32      d16, #0x20FFFF  @ encoding: [0xc2,0xef,0x10,0x0d]
-@ CHECK: vmov.i64 d16, #0xFF0000FF0000FFFF @ encoding: [0xc1,0xff,0x33,0x0e]
+@ CHECK: vmov.i32      d16, #0x20ff    @ encoding: [0xc2,0xef,0x10,0x0c]
+@ CHECK: vmov.i32      d16, #0x20ffff  @ encoding: [0xc2,0xef,0x10,0x0d]
+@ CHECK: vmov.i64 d16, #0xff0000ff0000ffff @ encoding: [0xc1,0xff,0x33,0x0e]
 
 
        vmov.i8 q8, #0x8
@@ -43,9 +43,9 @@
 @ CHECK: vmov.i32      q8, #0x2000     @ encoding: [0xc2,0xef,0x50,0x02]
 @ CHECK: vmov.i32      q8, #0x200000   @ encoding: [0xc2,0xef,0x50,0x04]
 @ CHECK: vmov.i32      q8, #0x20000000 @ encoding: [0xc2,0xef,0x50,0x06]
-@ CHECK: vmov.i32      q8, #0x20FF     @ encoding: [0xc2,0xef,0x50,0x0c]
-@ CHECK: vmov.i32      q8, #0x20FFFF   @ encoding: [0xc2,0xef,0x50,0x0d]
-@ CHECK: vmov.i64 q8, #0xFF0000FF0000FFFF @ encoding: [0xc1,0xff,0x73,0x0e]
+@ CHECK: vmov.i32      q8, #0x20ff     @ encoding: [0xc2,0xef,0x50,0x0c]
+@ CHECK: vmov.i32      q8, #0x20ffff   @ encoding: [0xc2,0xef,0x50,0x0d]
+@ CHECK: vmov.i64 q8, #0xff0000ff0000ffff @ encoding: [0xc1,0xff,0x73,0x0e]
 
 
        vmvn.i16        d16, #0x10
@@ -63,8 +63,8 @@
 @ CHECK: vmvn.i32      d16, #0x2000    @ encoding: [0xc2,0xef,0x30,0x02]
 @ CHECK: vmvn.i32      d16, #0x200000  @ encoding: [0xc2,0xef,0x30,0x04]
 @ CHECK: vmvn.i32      d16, #0x20000000 @ encoding: [0xc2,0xef,0x30,0x06]
-@ CHECK: vmvn.i32      d16, #0x20FF    @ encoding: [0xc2,0xef,0x30,0x0c]
-@ CHECK: vmvn.i32      d16, #0x20FFFF  @ encoding: [0xc2,0xef,0x30,0x0d]
+@ CHECK: vmvn.i32      d16, #0x20ff    @ encoding: [0xc2,0xef,0x30,0x0c]
+@ CHECK: vmvn.i32      d16, #0x20ffff  @ encoding: [0xc2,0xef,0x30,0x0d]
 
 
        vmovl.s8        q8, d16
index 1e03debefab6bd782cd9204eddf2611458d5c199..f44c2a02cf06024ed4d7371d2543ea418967a563 100644 (file)
@@ -30,7 +30,7 @@
 # CHECK:       vorr    d0, d15, d15
 0x1f 0x01 0x2f 0xf2
 
-# CHECK:       vmov.i64        q6, #0xFF00FF00FF
+# CHECK:       vmov.i64        q6, #0xff00ff00ff
 0x75 0xce 0x81 0xf2
 
 # CHECK:       vmvn.i32        d0, #0x0
 # CHECK:       vpop    {d8}
 0x02 0x8b 0xbd 0xec
 
-# CHECK:       vorr.i32        q15, #0x4F0000
+# CHECK:       vorr.i32        q15, #0x4f0000
 0x5f 0xe5 0xc4 0xf2
 
-# CHECK:       vbic.i32        q2, #0xA900
+# CHECK:       vbic.i32        q2, #0xa900
 0x79 0x43 0x82 0xf3
 
 # CHECK:       vst2.32 {d16, d18}, [r2, :64], r2
index 1623a0ce4346d12dab0f33b6e852d774640c15db..73bcd3703a96f9ab94a7f259466a8c89b2ad0bd0 100644 (file)
 0xf2 0x01 0x50 0xf2
 # CHECK: vbic  q8, q8, q9
 0x3f 0x07 0xc7 0xf3
-# CHECK: vbic.i32      d16, #0xFF000000
+# CHECK: vbic.i32      d16, #0xff000000
 0x7f 0x07 0xc7 0xf3
-# CHECK: vbic.i32      q8, #0xFF000000
+# CHECK: vbic.i32      q8, #0xff000000
 
 0xb0 0x01 0x71 0xf2
 # CHECK: vorn  d16, d17, d16
 0x10 0x06 0xc2 0xf2
 # CHECK: vmov.i32      d16, #0x20000000
 0x10 0x0c 0xc2 0xf2
-# CHECK: vmov.i32      d16, #0x20FF
+# CHECK: vmov.i32      d16, #0x20ff
 0x10 0x0d 0xc2 0xf2
-# CHECK: vmov.i32      d16, #0x20FFFF
+# CHECK: vmov.i32      d16, #0x20ffff
 0x33 0x0e 0xc1 0xf3
-# CHECK: vmov.i64      d16, #0xFF0000FF0000FFFF
+# CHECK: vmov.i64      d16, #0xff0000ff0000ffff
 0x58 0x0e 0xc0 0xf2
 # CHECK: vmov.i8       q8, #0x8
 0x50 0x08 0xc1 0xf2
 0x50 0x06 0xc2 0xf2
 # CHECK: vmov.i32      q8, #0x20000000
 0x50 0x0c 0xc2 0xf2
-# CHECK: vmov.i32      q8, #0x20FF
+# CHECK: vmov.i32      q8, #0x20ff
 0x50 0x0d 0xc2 0xf2
-# CHECK: vmov.i32      q8, #0x20FFFF
+# CHECK: vmov.i32      q8, #0x20ffff
 0x73 0x0e 0xc1 0xf3
-# CHECK: vmov.i64      q8, #0xFF0000FF0000FFFF
+# CHECK: vmov.i64      q8, #0xff0000ff0000ffff
 0x30 0x08 0xc1 0xf2
 # CHECK: vmvn.i16      d16, #0x10
 0x30 0x0a 0xc1 0xf2
 0x30 0x06 0xc2 0xf2
 # CHECK: vmvn.i32      d16, #0x20000000
 0x30 0x0c 0xc2 0xf2
-# CHECK: vmvn.i32      d16, #0x20FF
+# CHECK: vmvn.i32      d16, #0x20ff
 0x30 0x0d 0xc2 0xf2
-# CHECK: vmvn.i32      d16, #0x20FFFF
+# CHECK: vmvn.i32      d16, #0x20ffff
 0x30 0x0a 0xc8 0xf2
 # CHECK: vmovl.s8      q8, d16
 0x30 0x0a 0xd0 0xf2
index c456e8b86132b08d9ea5df956c79cd56ed16e6d2..6f01f522ad9f9b477d7dbac62a7273a4cc578ddb 100644 (file)
 0x50 0xef 0xf2 0x01
 # CHECK: vbic  q8, q8, q9
 0xc7 0xff 0x3f 0x07
-# CHECK: vbic.i32      d16, #0xFF000000
+# CHECK: vbic.i32      d16, #0xff000000
 0xc7 0xff 0x7f 0x07
-# CHECK: vbic.i32      q8, #0xFF000000
+# CHECK: vbic.i32      q8, #0xff000000
 
 0x71 0xef 0xb0 0x01
 # CHECK: vorn  d16, d17, d16
 0xc2 0xef 0x10 0x06
 # CHECK: vmov.i32      d16, #0x20000000
 0xc2 0xef 0x10 0x0c
-# CHECK: vmov.i32      d16, #0x20FF
+# CHECK: vmov.i32      d16, #0x20ff
 0xc2 0xef 0x10 0x0d
-# CHECK: vmov.i32      d16, #0x20FFFF
+# CHECK: vmov.i32      d16, #0x20ffff
 0xc1 0xff 0x33 0x0e
-# CHECK: vmov.i64      d16, #0xFF0000FF0000FFFF
+# CHECK: vmov.i64      d16, #0xff0000ff0000ffff
 0xc0 0xef 0x58 0x0e
 # CHECK: vmov.i8       q8, #0x8
 0xc1 0xef 0x50 0x08
 0xc2 0xef 0x50 0x06
 # CHECK: vmov.i32      q8, #0x20000000
 0xc2 0xef 0x50 0x0c
-# CHECK: vmov.i32      q8, #0x20FF
+# CHECK: vmov.i32      q8, #0x20ff
 0xc2 0xef 0x50 0x0d
-# CHECK: vmov.i32      q8, #0x20FFFF
+# CHECK: vmov.i32      q8, #0x20ffff
 0xc1 0xff 0x73 0x0e
-# CHECK: vmov.i64      q8, #0xFF0000FF0000FFFF
+# CHECK: vmov.i64      q8, #0xff0000ff0000ffff
 0xc1 0xef 0x30 0x08
 # CHECK: vmvn.i16      d16, #0x10
 0xc1 0xef 0x30 0x0a
 0xc2 0xef 0x30 0x06
 # CHECK: vmvn.i32      d16, #0x20000000
 0xc2 0xef 0x30 0x0c
-# CHECK: vmvn.i32      d16, #0x20FF
+# CHECK: vmvn.i32      d16, #0x20ff
 0xc2 0xef 0x30 0x0d
-# CHECK: vmvn.i32      d16, #0x20FFFF
+# CHECK: vmvn.i32      d16, #0x20ffff
 0xc8 0xef 0x30 0x0a
 # CHECK: vmovl.s8      q8, d16
 0xd0 0xef 0x30 0x0a