RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-01 05:01:59 +01:00
Code Issues Projects Releases Wiki Activity

WebAssembly: fix call/return syntax.

Browse Source 
They are now typeless, unlike other operations.

llvm-svn: 250793
This commit is contained in:
JF Bastien 2015-10-20 01:26:54 +00:00
parent a94e8688bd
commit 73bf323fe1
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
View File

@ -105,7 +105,12 @@ static std::string OpcodeName(const WebAssemblyInstrInfo *TII,
bool HasType = std::string::npos != Under;
std::string::size_type NameEnd = HasType ? Under : Len;
std::string Name(&N[0], &N[NameEnd]);
return HasType ? (std::string(&N[NameEnd + 1], &N[Len]) + '.' + Name) : Name;
if (!HasType)
return Name;
for (const char *typelessOpcode : { "return", "call" })
if (Name == typelessOpcode)
return Name;
return std::string(&N[NameEnd + 1], &N[Len]) + '.' + Name;
}
static std::string toSymbol(StringRef S) { return ("$" + S).str(); }

6
test/CodeGen/WebAssembly/func.ll
View File

@ -17,7 +17,7 @@ define void @f0() {
; CHECK-NEXT: .local i32{{$}}
; CHECK-NEXT: i32.const 0{{$}}
; CHECK-NEXT: set_local 0, pop{{$}}
; CHECK-NEXT: i32.return (get_local 0){{$}}
; CHECK-NEXT: return (get_local 0){{$}}
; CHECK: .size f1,
define i32 @f1() {
ret i32 0
@ -30,7 +30,7 @@ define i32 @f1() {
; CHECK-NEXT: .local i32{{$}}
; CHECK-NEXT: i32.const 0{{$}}
; CHECK-NEXT: set_local 2, pop{{$}}
; CHECK-NEXT: i32.return (get_local 2){{$}}
; CHECK-NEXT: return (get_local 2){{$}}
; CHECK: .size f2,
define i32 @f2(i32 %p1, float %p2) {
ret i32 0
@ -40,7 +40,7 @@ define i32 @f2(i32 %p1, float %p2) {
; CHECK-NEXT: .param i32{{$}}
; CHECK-NEXT: .param f32{{$}}
; CHECK-NOT: .local
; CHECK-NEXT: void.return{{$}}
; CHECK-NEXT: return{{$}}
; CHECK: .size f3,
define void @f3(i32 %p1, float %p2) {
ret void

10
test/CodeGen/WebAssembly/return-int32.ll Normal file
View File

@ -0,0 +1,10 @@
; RUN: llc < %s -asm-verbose=false | FileCheck %s
target datalayout = "e-p:32:32-i64:64-n32:64-S128"
target triple = "wasm32-unknown-unknown"
; CHECK-LABEL: return_i32:
; CHECK: return (get_local 1){{$}}
define i32 @return_i32(i32 %p) {
ret i32 %p
}