replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[WebAssembly] i32.const operands should be signed 

Summary:
This was causing large addresses to be emitted as negative numbers,
which rightfully caused crashes in binaryen.

Reviewers: aheejin, dschuff

Subscribers: sbc100, jgravelle-google, sunfish, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D64612

llvm-svn: 365930
This commit is contained in:
Thomas Lively 2019-07-12 17:55:07 +00:00
parent 98f931639b
commit 26a6b95da9
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lld/test/wasm/data-segments.ll
View File

@ -41,7 +41,7 @@ target triple = "wasm32-unknown-unknown"
@a = hidden global [6 x i8] c"hello\00", align 1 @a = hidden global [6 x i8] c"hello\00", align 1
@b = hidden global [8 x i8] c"goodbye\00", align 1 @b = hidden global [8 x i8] c"goodbye\00", align 1
@c = hidden global [9 x i8] c"whatever\00", align 1 @c = hidden global [10000 x i8] zeroinitializer, align 1
@d = hidden global i32 42, align 4 @d = hidden global i32 42, align 4
@e = private constant [9 x i8] c"constant\00", align 1 @e = private constant [9 x i8] c"constant\00", align 1
@ -61,12 +61,19 @@ target triple = "wasm32-unknown-unknown"
; ACTIVE-NEXT: Offset: ; ACTIVE-NEXT: Offset:
; ACTIVE-NEXT: Opcode: I32_CONST ; ACTIVE-NEXT: Opcode: I32_CONST
; ACTIVE-NEXT: Value: 1024 ; ACTIVE-NEXT: Value: 1024
; ACTIVE-NEXT: Content: 68656C6C6F00676F6F6462796500776861746576657200002A000000 ; ACTIVE-NEXT: Content: 68656C6C6F00676F6F646279650000002A000000
; ACTIVE-NEXT: - SectionOffset: 41 ; ACTIVE-NEXT: - SectionOffset: 34
; ACTIVE-NEXT: InitFlags: 0 ; ACTIVE-NEXT: InitFlags: 0
; ACTIVE-NEXT: Offset: ; ACTIVE-NEXT: Offset:
; ACTIVE-NEXT: Opcode: I32_CONST ; ACTIVE-NEXT: Opcode: I32_CONST
; ACTIVE-NEXT: Value: 1052 ; ACTIVE-NEXT: Value: 1044
; ACTIVE-NEXT: Content: '0000000000
; ACTIVE-SAME: 0000000000'
; ACTIVE-NEXT: - SectionOffset: 10041
; ACTIVE-NEXT: InitFlags: 0
; ACTIVE-NEXT: Offset:
; ACTIVE-NEXT: Opcode: I32_CONST
; ACTIVE-NEXT: Value: 11044
; ACTIVE-NEXT: Content: 636F6E7374616E74000000002B ; ACTIVE-NEXT: Content: 636F6E7374616E74000000002B
; ACTIVE-NEXT: - Type: CUSTOM ; ACTIVE-NEXT: - Type: CUSTOM
; ACTIVE-NEXT: Name: name ; ACTIVE-NEXT: Name: name
@ -81,13 +88,17 @@ target triple = "wasm32-unknown-unknown"
; PASSIVE-NEXT: Body: 10010B ; PASSIVE-NEXT: Body: 10010B
; PASSIVE-NEXT: - Index: 1 ; PASSIVE-NEXT: - Index: 1
; PASSIVE-NEXT: Locals: [] ; PASSIVE-NEXT: Locals: []
; PASSIVE-NEXT: Body: 4180084100411CFC080000FC0900419C084100410DFC080100FC09010B ; PASSIVE-NEXT: Body: 41800841004114FC080000FC090041940841004190CE00FC080100FC090141A4D6004100410DFC080200FC09020B
; PASSIVE-NEXT: - Type: DATA ; PASSIVE-NEXT: - Type: DATA
; PASSIVE-NEXT: Segments: ; PASSIVE-NEXT: Segments:
; PASSIVE-NEXT: - SectionOffset: 3 ; PASSIVE-NEXT: - SectionOffset: 3
; PASSIVE-NEXT: InitFlags: 1 ; PASSIVE-NEXT: InitFlags: 1
; PASSIVE-NEXT: Content: 68656C6C6F00676F6F6462796500776861746576657200002A000000 ; PASSIVE-NEXT: Content: 68656C6C6F00676F6F646279650000002A000000
; PASSIVE-NEXT: - SectionOffset: 33 ; PASSIVE-NEXT: - SectionOffset: 26
; PASSIVE-NEXT: InitFlags: 1
; PASSIVE-NEXT: Content: '0000000000
; PASSIVE-SAME: 0000000000'
; PASSIVE-NEXT: - SectionOffset: 10028
; PASSIVE-NEXT: InitFlags: 1 ; PASSIVE-NEXT: InitFlags: 1
; PASSIVE-NEXT: Content: 636F6E7374616E74000000002B ; PASSIVE-NEXT: Content: 636F6E7374616E74000000002B
; PASSIVE-NEXT: - Type: CUSTOM ; PASSIVE-NEXT: - Type: CUSTOM

6
lld/wasm/Writer.cpp
View File

@ -658,13 +658,13 @@ void Writer::createInitMemoryFunction() {
if (s->initFlags & WASM_SEGMENT_IS_PASSIVE) { if (s->initFlags & WASM_SEGMENT_IS_PASSIVE) {
// destination address // destination address
writeU8(os, WASM_OPCODE_I32_CONST, "i32.const"); writeU8(os, WASM_OPCODE_I32_CONST, "i32.const");
writeUleb128(os, s->startVA, "destination address"); writeSleb128(os, s->startVA, "destination address");
// source segment offset // source segment offset
writeU8(os, WASM_OPCODE_I32_CONST, "i32.const"); writeU8(os, WASM_OPCODE_I32_CONST, "i32.const");
writeUleb128(os, 0, "segment offset"); writeSleb128(os, 0, "segment offset");
// memory region size // memory region size
writeU8(os, WASM_OPCODE_I32_CONST, "i32.const"); writeU8(os, WASM_OPCODE_I32_CONST, "i32.const");
writeUleb128(os, s->size, "memory region size"); writeSleb128(os, s->size, "memory region size");
// memory.init instruction // memory.init instruction
writeU8(os, WASM_OPCODE_MISC_PREFIX, "bulk-memory prefix"); writeU8(os, WASM_OPCODE_MISC_PREFIX, "bulk-memory prefix");
writeUleb128(os, WASM_OPCODE_MEMORY_INIT, "MEMORY.INIT"); writeUleb128(os, WASM_OPCODE_MEMORY_INIT, "MEMORY.INIT");