maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fixed the problem with a branch to "0b" that was not parsed by llvm-mc 

correctly.  The Lexer was incorrectly eating the newline casusing it to branch
to address 0.  Updated the test case to use a "0:" label and a branch to "0b".

llvm-svn: 104038
This commit is contained in:
Kevin Enderby 2010-05-18 17:51:35 +00:00
parent 162b419a02
commit 53e0631516
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
llvm/lib/MC/MCParser/AsmLexer.cpp
View File

@ -157,7 +157,6 @@ AsmToken AsmLexer::LexDigit() {
if (CurPtr[0] == '\n') { if (CurPtr[0] == '\n') {
--CurPtr; --CurPtr;
StringRef Result(TokStart, CurPtr - TokStart); StringRef Result(TokStart, CurPtr - TokStart);
++CurPtr;
return AsmToken(AsmToken::Integer, Result, 0); return AsmToken(AsmToken::Integer, Result, 0);
} }
const char *NumStart = CurPtr; const char *NumStart = CurPtr;

27
llvm/test/MC/MachO/direction_labels.s
View File

@ -1,12 +1,15 @@
// RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | macho-dump --dump-section-data | FileCheck %s // RUN: llvm-mc -triple i386-apple-darwin9 %s -filetype=obj -o - | macho-dump --dump-section-data | FileCheck %s
direction_labels: direction_labels:
10: nop 10: nop
jmp 10b jmp 10b
nop nop
jmp 11f jne 0f
11: nop 0: nop
ret jne 0b
jmp 11f
11: nop
ret
// CHECK: ('cputype', 7) // CHECK: ('cputype', 7)
// CHECK: ('cpusubtype', 3) // CHECK: ('cpusubtype', 3)
@ -20,9 +23,9 @@ direction_labels:
// CHECK: ('size', 124) // CHECK: ('size', 124)
// CHECK: ('segment_name', '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00') // CHECK: ('segment_name', '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
// CHECK: ('vm_addr', 0) // CHECK: ('vm_addr', 0)
// CHECK: ('vm_size', 8) // CHECK: ('vm_size', 13)
// CHECK: ('file_offset', 256) // CHECK: ('file_offset', 256)
// CHECK: ('file_size', 8) // CHECK: ('file_size', 13)
// CHECK: ('maxprot', 7) // CHECK: ('maxprot', 7)
// CHECK: ('initprot', 7) // CHECK: ('initprot', 7)
// CHECK: ('num_sections', 1) // CHECK: ('num_sections', 1)
@ -32,7 +35,7 @@ direction_labels:
// CHECK: (('section_name', '__text\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00') // CHECK: (('section_name', '__text\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
// CHECK: ('segment_name', '__TEXT\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00') // CHECK: ('segment_name', '__TEXT\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
// CHECK: ('address', 0) // CHECK: ('address', 0)
// CHECK: ('size', 8) // CHECK: ('size', 13)
// CHECK: ('offset', 256) // CHECK: ('offset', 256)
// CHECK: ('alignment', 0) // CHECK: ('alignment', 0)
// CHECK: ('reloc_offset', 0) // CHECK: ('reloc_offset', 0)
@ -43,15 +46,15 @@ direction_labels:
// CHECK: ), // CHECK: ),
// CHECK: ('_relocations', [ // CHECK: ('_relocations', [
// CHECK: ]) // CHECK: ])
// CHECK: ('_section_data', '\x90\xeb\xfd\x90\xeb\x00\x90\xc3') // CHECK: ('_section_data', '\x90\xeb\xfd\x90u\x00\x90u\xfd\xeb\x00\x90\xc3')
// CHECK: ]) // CHECK: ])
// CHECK: ), // CHECK: ),
// CHECK: # Load Command 1 // CHECK: # Load Command 1
// CHECK: (('command', 2) // CHECK: (('command', 2)
// CHECK: ('size', 24) // CHECK: ('size', 24)
// CHECK: ('symoff', 264) // CHECK: ('symoff', 272)
// CHECK: ('nsyms', 1) // CHECK: ('nsyms', 1)
// CHECK: ('stroff', 276) // CHECK: ('stroff', 284)
// CHECK: ('strsize', 20) // CHECK: ('strsize', 20)
// CHECK: ('_string_data', '\x00direction_labels\x00\x00\x00') // CHECK: ('_string_data', '\x00direction_labels\x00\x00\x00')
// CHECK: ('_symbols', [ // CHECK: ('_symbols', [