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

lcall and ljmp always default to lcalll and ljmpl. This finally 

wraps up r8418316

llvm-svn: 113949
This commit is contained in:
Chris Lattner 2010-09-15 05:30:20 +00:00
parent 09bfe645f6
commit ee7e6f42f8
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
View File

@ -979,16 +979,6 @@ ParseInstruction(StringRef Name, SMLoc NameLoc,
NameLoc, NameLoc));
}
// lcall *x and ljmp *x -> lcalll and ljmpl
if ((Name == "lcall" || Name == "ljmp") &&
Operands.size() == 3 &&
static_cast<X86Operand*>(Operands[1])->isToken() &&
static_cast<X86Operand*>(Operands[1])->getToken() == "*") {
delete Operands[0];
Operands[0] = X86Operand::CreateToken(Name == "lcall" ? "lcalll" : "ljmpl",
NameLoc);
}
// jmp $42,$5 -> ljmp, similarly for call.
if ((Name.startswith("call") || Name.startswith("jmp")) &&
Operands.size() == 3 &&
@ -1007,9 +997,17 @@ ParseInstruction(StringRef Name, SMLoc NameLoc,
if (NewOpName) {
delete Operands[0];
Operands[0] = X86Operand::CreateToken(NewOpName, NameLoc);
Name = NewOpName;
}
}
// lcall and ljmp -> lcalll and ljmpl
if ((Name == "lcall" || Name == "ljmp") && Operands.size() == 3) {
delete Operands[0];
Operands[0] = X86Operand::CreateToken(Name == "lcall" ? "lcalll" : "ljmpl",
NameLoc);
}
return false;
}

10
llvm/test/MC/AsmParser/X86/x86_32-new-encoder.s
View File

@ -551,4 +551,14 @@ lcalll $0x7ace,$0x7ace
jmpl $0x7ace,$0x7ace
ljmpl $0x7ace,$0x7ace
// CHECK: lcalll $31438, $31438
// CHECK: lcalll $31438, $31438
// CHECK: ljmpl $31438, $31438
// CHECK: ljmpl $31438, $31438
call $0x7ace,$0x7ace
lcall $0x7ace,$0x7ace
jmp $0x7ace,$0x7ace
ljmp $0x7ace,$0x7ace