[llvm-commits] [llvm] r67591 - in /llvm/branches/Apple/Dib: test/CodeGen/ARM/constants.ll test/CodeGen/ARM/long.ll test/CodeGen/X86/2007-06-04-tailmerge4.ll test/CodeGen/X86/2008-03-23-DarwinAsmComments.ll test/CodeGen/X86/2009-03-16-PHIElimInLPad.ll test/TableGen/String.td utils/TableGen/TGLexer.cpp
Bill Wendling
isanbard at gmail.com
Mon Mar 23 18:07:15 PDT 2009
Author: void
Date: Mon Mar 23 20:07:14 2009
New Revision: 67591
URL: http://llvm.org/viewvc/llvm-project?rev=67591&view=rev
Log:
Revert r66949 and r66957 from Dib.
Removed:
llvm/branches/Apple/Dib/test/TableGen/String.td
Modified:
llvm/branches/Apple/Dib/test/CodeGen/ARM/constants.ll
llvm/branches/Apple/Dib/test/CodeGen/ARM/long.ll
llvm/branches/Apple/Dib/test/CodeGen/X86/2007-06-04-tailmerge4.ll
llvm/branches/Apple/Dib/test/CodeGen/X86/2008-03-23-DarwinAsmComments.ll
llvm/branches/Apple/Dib/test/CodeGen/X86/2009-03-16-PHIElimInLPad.ll
llvm/branches/Apple/Dib/utils/TableGen/TGLexer.cpp
Modified: llvm/branches/Apple/Dib/test/CodeGen/ARM/constants.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/test/CodeGen/ARM/constants.ll?rev=67591&r1=67590&r2=67591&view=diff
==============================================================================
--- llvm/branches/Apple/Dib/test/CodeGen/ARM/constants.ll (original)
+++ llvm/branches/Apple/Dib/test/CodeGen/ARM/constants.ll Mon Mar 23 20:07:14 2009
@@ -2,11 +2,11 @@
; RUN: grep {mov r0, #0} | count 1
; RUN: llvm-as < %s | llc -march=arm | \
; RUN: grep {mov r0, #255$} | count 1
-; RUN: llvm-as < %s | llc -march=arm | \
+; RUN: llvm-as < %s | llc -march=arm -asm-verbose | \
; RUN: grep {mov r0.*256} | count 1
-; RUN: llvm-as < %s | llc -march=arm | grep {orr.*256} | count 1
-; RUN: llvm-as < %s | llc -march=arm | grep {mov r0, .*-1073741761} | count 1
-; RUN: llvm-as < %s | llc -march=arm | grep {mov r0, .*1008} | count 1
+; RUN: llvm-as < %s | llc -march=arm -asm-verbose | grep {orr.*256} | count 1
+; RUN: llvm-as < %s | llc -march=arm -asm-verbose | grep {mov r0, .*-1073741761} | count 1
+; RUN: llvm-as < %s | llc -march=arm -asm-verbose | grep {mov r0, .*1008} | count 1
; RUN: llvm-as < %s | llc -march=arm | grep {cmp r0, #1, 16} | count 1
define i32 @f1() {
Modified: llvm/branches/Apple/Dib/test/CodeGen/ARM/long.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/test/CodeGen/ARM/long.ll?rev=67591&r1=67590&r2=67591&view=diff
==============================================================================
--- llvm/branches/Apple/Dib/test/CodeGen/ARM/long.ll (original)
+++ llvm/branches/Apple/Dib/test/CodeGen/ARM/long.ll Mon Mar 23 20:07:14 2009
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm | \
+; RUN: llvm-as < %s | llc -march=arm -asm-verbose | \
; RUN: grep -- {-2147483648} | count 3
; RUN: llvm-as < %s | llc -march=arm | grep mvn | count 3
; RUN: llvm-as < %s | llc -march=arm | grep adds | count 1
Modified: llvm/branches/Apple/Dib/test/CodeGen/X86/2007-06-04-tailmerge4.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/test/CodeGen/X86/2007-06-04-tailmerge4.ll?rev=67591&r1=67590&r2=67591&view=diff
==============================================================================
--- llvm/branches/Apple/Dib/test/CodeGen/X86/2007-06-04-tailmerge4.ll (original)
+++ llvm/branches/Apple/Dib/test/CodeGen/X86/2007-06-04-tailmerge4.ll Mon Mar 23 20:07:14 2009
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-eh | grep invcont131
+; RUN: llvm-as < %s | llc -enable-eh -asm-verbose | grep invcont131
; PR 1496: tail merge was incorrectly removing this block
; ModuleID = 'report.1.bc'
Modified: llvm/branches/Apple/Dib/test/CodeGen/X86/2008-03-23-DarwinAsmComments.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/test/CodeGen/X86/2008-03-23-DarwinAsmComments.ll?rev=67591&r1=67590&r2=67591&view=diff
==============================================================================
--- llvm/branches/Apple/Dib/test/CodeGen/X86/2008-03-23-DarwinAsmComments.ll (original)
+++ llvm/branches/Apple/Dib/test/CodeGen/X86/2008-03-23-DarwinAsmComments.ll Mon Mar 23 20:07:14 2009
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin | grep {#} | not grep -v {##}
+; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin -asm-verbose | grep {#} | not grep -v {##}
%struct.AGenericCall = type { %struct.AGenericManager*, %struct.ComponentParameters*, i32* }
%struct.AGenericManager = type <{ i8 }>
Modified: llvm/branches/Apple/Dib/test/CodeGen/X86/2009-03-16-PHIElimInLPad.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/test/CodeGen/X86/2009-03-16-PHIElimInLPad.ll?rev=67591&r1=67590&r2=67591&view=diff
==============================================================================
--- llvm/branches/Apple/Dib/test/CodeGen/X86/2009-03-16-PHIElimInLPad.ll (original)
+++ llvm/branches/Apple/Dib/test/CodeGen/X86/2009-03-16-PHIElimInLPad.ll Mon Mar 23 20:07:14 2009
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep -A 1 lpad | grep Llabel
+; RUN: llvm-as < %s | llc -march=x86 -asm-verbose | grep -A 1 lpad | grep Llabel
; Check that register copies in the landing pad come after the EH_LABEL
declare i32 @f()
Removed: llvm/branches/Apple/Dib/test/TableGen/String.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/test/TableGen/String.td?rev=67590&view=auto
==============================================================================
--- llvm/branches/Apple/Dib/test/TableGen/String.td (original)
+++ llvm/branches/Apple/Dib/test/TableGen/String.td (removed)
@@ -1,5 +0,0 @@
-// RUN: tblgen %s
-class x {
- string y = "missing terminating '\"' character";
-}
-
Modified: llvm/branches/Apple/Dib/utils/TableGen/TGLexer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/utils/TableGen/TGLexer.cpp?rev=67591&r1=67590&r2=67591&view=diff
==============================================================================
--- llvm/branches/Apple/Dib/utils/TableGen/TGLexer.cpp (original)
+++ llvm/branches/Apple/Dib/utils/TableGen/TGLexer.cpp Mon Mar 23 20:07:14 2009
@@ -151,8 +151,6 @@
tgtok::TokKind TGLexer::LexString() {
const char *StrStart = CurPtr;
- CurStrVal = "";
-
while (*CurPtr != '"') {
// If we hit the end of the buffer, report an error.
if (*CurPtr == 0 && CurPtr == CurBuf->getBufferEnd())
@@ -161,41 +159,10 @@
if (*CurPtr == '\n' || *CurPtr == '\r')
return ReturnError(StrStart, "End of line in string literal");
- if (*CurPtr != '\\') {
- CurStrVal += *CurPtr++;
- continue;
- }
-
++CurPtr;
-
- switch (*CurPtr) {
- case '\\': case '\'': case '"':
- // These turn into their literal character.
- CurStrVal += *CurPtr++;
- break;
- case 't':
- CurStrVal += "\\t";
- ++CurPtr;
- break;
- case 'n':
- CurStrVal += "\\n";
- ++CurPtr;
- break;
-
- case '\n':
- case '\r':
- return ReturnError(CurPtr, "escaped newlines not supported in tblgen");
-
- // If we hit the end of the buffer, report an error.
- case '\0':
- if (CurPtr == CurBuf->getBufferEnd())
- return ReturnError(StrStart, "End of file in string literal");
- // FALL THROUGH
- default:
- return ReturnError(CurPtr, "invalid escape in string literal");
- }
}
+ CurStrVal.assign(StrStart, CurPtr);
++CurPtr;
return tgtok::StrVal;
}
More information about the llvm-commits
mailing list