diff --git a/lld/test/wasm/alias.s b/lld/test/wasm/alias.s --- a/lld/test/wasm/alias.s +++ b/lld/test/wasm/alias.s @@ -24,7 +24,7 @@ # CHECK-NEXT: FunctionTypes: [ 0 ] # CHECK-NEXT: - Type: MEMORY # CHECK-NEXT: Memories: -# CHECK-NEXT: - Initial: 0x2 +# CHECK-NEXT: - Minimum: 0x2 # CHECK-NEXT: - Type: GLOBAL # CHECK-NEXT: Globals: # CHECK-NEXT: - Index: 0 diff --git a/lld/test/wasm/bsymbolic.s b/lld/test/wasm/bsymbolic.s --- a/lld/test/wasm/bsymbolic.s +++ b/lld/test/wasm/bsymbolic.s @@ -14,7 +14,7 @@ // NOOPTION-NEXT: Field: memory // NOOPTION-NEXT: Kind: MEMORY // NOOPTION-NEXT: Memory: -// NOOPTION-NEXT: Initial: 0x1 +// NOOPTION-NEXT: Minimum: 0x1 // NOOPTION-NEXT: - Module: env // NOOPTION-NEXT: Field: __memory_base // NOOPTION-NEXT: Kind: GLOBAL @@ -56,7 +56,7 @@ // SYMBOLIC-NEXT: Field: memory // SYMBOLIC-NEXT: Kind: MEMORY // SYMBOLIC-NEXT: Memory: -// SYMBOLIC-NEXT: Initial: 0x1 +// SYMBOLIC-NEXT: Minimum: 0x1 // SYMBOLIC-NEXT: - Module: env // SYMBOLIC-NEXT: Field: __memory_base // SYMBOLIC-NEXT: Kind: GLOBAL @@ -74,7 +74,7 @@ // SYMBOLIC-NEXT: Index: 0 // SYMBOLIC-NEXT: ElemType: FUNCREF // SYMBOLIC-NEXT: Limits: -// SYMBOLIC-NEXT: Initial: 0x1 +// SYMBOLIC-NEXT: Minimum: 0x1 // SYMBOLIC-NEXT: - Type: FUNCTION // SYMBOLIC: - Type: GLOBAL diff --git a/lld/test/wasm/call-indirect.ll b/lld/test/wasm/call-indirect.ll --- a/lld/test/wasm/call-indirect.ll +++ b/lld/test/wasm/call-indirect.ll @@ -67,11 +67,11 @@ ; CHECK-NEXT: ElemType: FUNCREF ; CHECK-NEXT: Limits: ; CHECK-NEXT: Flags: [ HAS_MAX ] -; CHECK-NEXT: Initial: 0x3 +; CHECK-NEXT: Minimum: 0x3 ; CHECK-NEXT: Maximum: 0x3 ; CHECK-NEXT: - Type: MEMORY ; CHECK-NEXT: Memories: -; CHECK-NEXT: - Initial: 0x2 +; CHECK-NEXT: - Minimum: 0x2 ; CHECK-NEXT: - Type: GLOBAL ; CHECK-NEXT: Globals: ; CHECK-NEXT: - Index: 0 diff --git a/lld/test/wasm/data-layout.s b/lld/test/wasm/data-layout.s --- a/lld/test/wasm/data-layout.s +++ b/lld/test/wasm/data-layout.s @@ -55,7 +55,7 @@ # CHECK: - Type: MEMORY # CHECK-NEXT: Memories: # CHK64-NEXT: - Flags: [ IS_64 ] -# CHECK-NEXT: Initial: 0x2 +# CHECK-NEXT: Minimum: 0x2 # CHECK-NEXT: - Type: GLOBAL # CHECK-NEXT: Globals: # CHECK-NEXT: - Index: 0 @@ -104,7 +104,7 @@ # CHECK-MAX: - Type: MEMORY # CHECK-MAX-NEXT: Memories: # CHECK-MAX-NEXT: - Flags: [ HAS_MAX ] -# CHECK-MAX-NEXT: Initial: 0x2 +# CHECK-MAX-NEXT: Minimum: 0x2 # CHECK-MAX-NEXT: Maximum: 0x2 # RUN: wasm-ld -no-gc-sections --allow-undefined --no-entry --shared-memory \ @@ -115,7 +115,7 @@ # CHECK-SHARED: - Type: MEMORY # CHECK-SHARED-NEXT: Memories: # CHECK-SHARED-NEXT: - Flags: [ HAS_MAX, IS_SHARED ] -# CHECK-SHARED-NEXT: Initial: 0x2 +# CHECK-SHARED-NEXT: Minimum: 0x2 # CHECK-SHARED-NEXT: Maximum: 0x2 # XUN: wasm-ld --relocatable -o %t_reloc.wasm %t32.o %t.hello32.o diff --git a/lld/test/wasm/export-table-explicit.test b/lld/test/wasm/export-table-explicit.test --- a/lld/test/wasm/export-table-explicit.test +++ b/lld/test/wasm/export-table-explicit.test @@ -13,7 +13,7 @@ # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: # CHECK-NEXT: Flags: [ HAS_MAX ] -# CHECK-NEXT: Initial: 0x1 +# CHECK-NEXT: Minimum: 0x1 # CHECK-NEXT: Maximum: 0x1 # CHECK-NEXT: - Type: diff --git a/lld/test/wasm/export-table.test b/lld/test/wasm/export-table.test --- a/lld/test/wasm/export-table.test +++ b/lld/test/wasm/export-table.test @@ -10,7 +10,7 @@ # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: # CHECK-NEXT: Flags: [ HAS_MAX ] -# CHECK-NEXT: Initial: 0x1 +# CHECK-NEXT: Minimum: 0x1 # CHECK-NEXT: Maximum: 0x1 # CHECK-NEXT: - Type: # CHECK: - Type: EXPORT diff --git a/lld/test/wasm/growable-table.test b/lld/test/wasm/growable-table.test --- a/lld/test/wasm/growable-table.test +++ b/lld/test/wasm/growable-table.test @@ -9,7 +9,7 @@ # CHECK-NEXT: - Index: 0 # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: -# CHECK-NEXT: Initial: 0x1 +# CHECK-NEXT: Minimum: 0x1 # CHECK-NEXT: - Type: # CHECK: - Type: EXPORT # CHECK-NEXT: Exports: diff --git a/lld/test/wasm/import-memory.test b/lld/test/wasm/import-memory.test --- a/lld/test/wasm/import-memory.test +++ b/lld/test/wasm/import-memory.test @@ -10,7 +10,7 @@ # CHECK-NEXT: Field: memory # CHECK-NEXT: Kind: MEMORY # CHECK-NEXT: Memory: -# CHECK-NEXT: Initial: 0x2 +# CHECK-NEXT: Minimum: 0x2 # CHECK-NEXT: - Type: @@ -28,7 +28,7 @@ # CHECK-MAX-NEXT: Kind: MEMORY # CHECK-MAX-NEXT: Memory: # CHECK-MAX-NEXT: Flags: [ HAS_MAX ] -# CHECK-MAX-NEXT: Initial: 0x4 +# CHECK-MAX-NEXT: Minimum: 0x4 # CHECK-MAX-NEXT: Maximum: 0x5 # CHECK-MAX-NEXT: - Type: @@ -45,6 +45,6 @@ # CHECK-SHARED-NEXT: Kind: MEMORY # CHECK-SHARED-NEXT: Memory: # CHECK-SHARED-NEXT: Flags: [ HAS_MAX, IS_SHARED ] -# CHECK-SHARED-NEXT: Initial: 0x4 +# CHECK-SHARED-NEXT: Minimum: 0x4 # CHECK-SHARED-NEXT: Maximum: 0x5 # CHECK-SHARED-NEXT: - Type: diff --git a/lld/test/wasm/import-table.test b/lld/test/wasm/import-table.test --- a/lld/test/wasm/import-table.test +++ b/lld/test/wasm/import-table.test @@ -21,5 +21,5 @@ # CHECK-NEXT: Index: 0 # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: -# CHECK-NEXT: Initial: 0x1 +# CHECK-NEXT: Minimum: 0x1 diff --git a/lld/test/wasm/large-memory.test b/lld/test/wasm/large-memory.test --- a/lld/test/wasm/large-memory.test +++ b/lld/test/wasm/large-memory.test @@ -12,7 +12,7 @@ CHECK: - Type: MEMORY CHECK-NEXT: Memories: CHECK-NEXT: - Flags: [ HAS_MAX ] -CHECK-NEXT: Initial: 0x2 +CHECK-NEXT: Minimum: 0x2 CHECK-2G-NEXT: Maximum: 0x8000 CHECK-4G-NEXT: Maximum: 0x10000 diff --git a/lld/test/wasm/local-symbols.ll b/lld/test/wasm/local-symbols.ll --- a/lld/test/wasm/local-symbols.ll +++ b/lld/test/wasm/local-symbols.ll @@ -37,7 +37,7 @@ ; CHECK-NEXT: FunctionTypes: [ 0, 1 ] ; CHECK-NEXT: - Type: MEMORY ; CHECK-NEXT: Memories: -; CHECK-NEXT: - Initial: 0x2 +; CHECK-NEXT: - Minimum: 0x2 ; CHECK-NEXT: - Type: GLOBAL ; CHECK-NEXT: Globals: ; CHECK-NEXT: - Index: 0 diff --git a/lld/test/wasm/locals-duplicate.test b/lld/test/wasm/locals-duplicate.test --- a/lld/test/wasm/locals-duplicate.test +++ b/lld/test/wasm/locals-duplicate.test @@ -22,11 +22,11 @@ ; CHECK-NEXT: ElemType: FUNCREF ; CHECK-NEXT: Limits: ; CHECK-NEXT: Flags: [ HAS_MAX ] -; CHECK-NEXT: Initial: 0x7 +; CHECK-NEXT: Minimum: 0x7 ; CHECK-NEXT: Maximum: 0x7 ; CHECK-NEXT: - Type: MEMORY ; CHECK-NEXT: Memories: -; CHECK-NEXT: - Initial: 0x2 +; CHECK-NEXT: - Minimum: 0x2 ; CHECK-NEXT: - Type: GLOBAL ; CHECK-NEXT: Globals: ; CHECK-NEXT: - Index: 0 @@ -240,13 +240,13 @@ ; RELOC-NEXT: Index: 0 ; RELOC-NEXT: ElemType: FUNCREF ; RELOC-NEXT: Limits: -; RELOC-NEXT: Initial: 0x7 +; RELOC-NEXT: Minimum: 0x7 ; RELOC-NEXT: - Type: FUNCTION ; RELOC-NEXT: FunctionTypes: [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ; RELOC-NEXT: 0, 0 ] ; RELOC-NEXT: - Type: MEMORY ; RELOC-NEXT: Memories: -; RELOC-NEXT: - Initial: 0x1 +; RELOC-NEXT: - Minimum: 0x1 ; RELOC-NEXT: - Type: ELEM ; RELOC-NEXT: Segments: ; RELOC-NEXT: - Offset: diff --git a/lld/test/wasm/multi-table.s b/lld/test/wasm/multi-table.s --- a/lld/test/wasm/multi-table.s +++ b/lld/test/wasm/multi-table.s @@ -54,7 +54,7 @@ # CHECK-NEXT: Index: 0 # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: -# CHECK-NEXT: Initial: 0x0 +# CHECK-NEXT: Minimum: 0x0 # CHECK-NEXT: - Module: env # CHECK-NEXT: Field: foo # CHECK-NEXT: Kind: FUNCTION @@ -66,20 +66,20 @@ # CHECK-NEXT: - Index: 1 # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: -# CHECK-NEXT: Initial: 0x0 +# CHECK-NEXT: Minimum: 0x0 # CHECK-NEXT: - Index: 2 # CHECK-NEXT: ElemType: EXTERNREF # CHECK-NEXT: Limits: -# CHECK-NEXT: Initial: 0x0 +# CHECK-NEXT: Minimum: 0x0 # CHECK-NEXT: - Index: 3 # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: # CHECK-NEXT: Flags: [ HAS_MAX ] -# CHECK-NEXT: Initial: 0x3 +# CHECK-NEXT: Minimum: 0x3 # CHECK-NEXT: Maximum: 0x3 # CHECK-NEXT: - Type: MEMORY # CHECK-NEXT: Memories: -# CHECK-NEXT: - Initial: 0x2 +# CHECK-NEXT: - Minimum: 0x2 # CHECK-NEXT: - Type: GLOBAL # CHECK-NEXT: Globals: # CHECK-NEXT: - Index: 0 diff --git a/lld/test/wasm/pie.ll b/lld/test/wasm/pie.ll --- a/lld/test/wasm/pie.ll +++ b/lld/test/wasm/pie.ll @@ -62,7 +62,7 @@ ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: ElemType: FUNCREF ; CHECK-NEXT: Limits: -; CHECK-NEXT: Initial: 0x1 +; CHECK-NEXT: Minimum: 0x1 ; CHECK: - Type: START ; CHECK-NEXT: StartFunction: 2 diff --git a/lld/test/wasm/relocatable.ll b/lld/test/wasm/relocatable.ll --- a/lld/test/wasm/relocatable.ll +++ b/lld/test/wasm/relocatable.ll @@ -66,7 +66,7 @@ ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: ElemType: FUNCREF ; CHECK-NEXT: Limits: -; CHECK-NEXT: Initial: 0x4 +; CHECK-NEXT: Minimum: 0x4 ; CHECK-NEXT: - Module: env ; CHECK-NEXT: Field: puts ; CHECK-NEXT: Kind: FUNCTION @@ -83,7 +83,7 @@ ; CHECK-NEXT: FunctionTypes: [ 2, 1, 1, 2 ] ; CHECK-NEXT: - Type: MEMORY ; CHECK-NEXT: Memories: -; CHECK-NEXT: - Initial: 0x1 +; CHECK-NEXT: - Minimum: 0x1 ; CHECK-NEXT: - Type: ELEM ; CHECK-NEXT: Segments: ; CHECK-NEXT: - Offset: diff --git a/lld/test/wasm/responsefile.test b/lld/test/wasm/responsefile.test --- a/lld/test/wasm/responsefile.test +++ b/lld/test/wasm/responsefile.test @@ -3,7 +3,7 @@ RUN: echo "%/t.o -o %/t.wasm -e ret32" > %t.rsp RUN: wasm-ld @%t.rsp --initial-memory=655360 RUN: llvm-readobj --sections %t.wasm | FileCheck %s -CHECK: InitialPages: 10 +CHECK: MinPages: 10 RUN: not wasm-ld --rsp-quoting=foobar @%t.rsp 2>&1 | \ RUN: FileCheck --check-prefix=INVRSP %s diff --git a/lld/test/wasm/shared-memory-no-atomics.yaml b/lld/test/wasm/shared-memory-no-atomics.yaml --- a/lld/test/wasm/shared-memory-no-atomics.yaml +++ b/lld/test/wasm/shared-memory-no-atomics.yaml @@ -14,7 +14,7 @@ Field: __linear_memory Kind: MEMORY Memory: - Initial: 0x00000001 + Minimum: 0x00000001 - Module: env Field: __indirect_function_table Kind: TABLE @@ -22,7 +22,7 @@ Index: 0 ElemType: FUNCREF Limits: - Initial: 0x00000000 + Minimum: 0x00000000 - Type: DATA Segments: - SectionOffset: 6 @@ -55,7 +55,7 @@ # NO-SHARED: - Type: MEMORY # NO-SHARED-NEXT: Memories: -# NO-SHARED-NEXT: - Initial: 0x2 +# NO-SHARED-NEXT: - Minimum: 0x2 # NO-SHARED-NOT: Maximum: # SHARED: --shared-memory is disallowed by {{.*}}shared-memory-no-atomics.yaml.tmp1.o because it was not compiled with 'atomics' or 'bulk-memory' features. diff --git a/lld/test/wasm/shared-memory.yaml b/lld/test/wasm/shared-memory.yaml --- a/lld/test/wasm/shared-memory.yaml +++ b/lld/test/wasm/shared-memory.yaml @@ -22,7 +22,7 @@ Field: __linear_memory Kind: MEMORY Memory: - Initial: 0x00000001 + Minimum: 0x00000001 - Module: env Field: __indirect_function_table Kind: TABLE @@ -30,7 +30,7 @@ Index: 0 ElemType: FUNCREF Limits: - Initial: 0x00000000 + Minimum: 0x00000000 - Type: DATA Segments: - SectionOffset: 6 @@ -64,11 +64,11 @@ # ATOMICS-RELOCATABLE: - Type: MEMORY # ATOMICS-RELOCATABLE-NEXT: Memories: -# ATOMICS-RELOCATABLE-NEXT: Initial: 0x1 +# ATOMICS-RELOCATABLE-NEXT: Minimum: 0x1 # ATOMICS-RELOCATABLE-NEXT: - Type: # SHARED: - Type: MEMORY # SHARED-NEXT: Memories: # SHARED-NEXT: - Flags: [ HAS_MAX, IS_SHARED ] -# SHARED-NEXT: Initial: 0x2 +# SHARED-NEXT: Minimum: 0x2 # SHARED-NEXT: Maximum: 0x2 diff --git a/lld/test/wasm/shared.ll b/lld/test/wasm/shared.ll --- a/lld/test/wasm/shared.ll +++ b/lld/test/wasm/shared.ll @@ -67,7 +67,7 @@ ; CHECK-NEXT: Field: memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Memory: -; CHECK-NEXT: Initial: 0x1 +; CHECK-NEXT: Minimum: 0x1 ; CHECK-NEXT: - Module: env ; CHECK-NEXT: Field: __indirect_function_table ; CHECK-NEXT: Kind: TABLE @@ -75,7 +75,7 @@ ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: ElemType: FUNCREF ; CHECK-NEXT: Limits: -; CHECK-NEXT: Initial: 0x2 +; CHECK-NEXT: Minimum: 0x2 ; CHECK-NEXT: - Module: env ; CHECK-NEXT: Field: __stack_pointer ; CHECK-NEXT: Kind: GLOBAL diff --git a/lld/test/wasm/stack-pointer.ll b/lld/test/wasm/stack-pointer.ll --- a/lld/test/wasm/stack-pointer.ll +++ b/lld/test/wasm/stack-pointer.ll @@ -32,7 +32,7 @@ ; CHECK-NEXT: FunctionTypes: [ 0 ] ; CHECK-NEXT: - Type: MEMORY ; CHECK-NEXT: Memories: -; CHECK-NEXT: - Initial: 0x0 +; CHECK-NEXT: - Minimum: 0x0 ; CHECK-NEXT: - Type: CODE ; CHECK-NEXT: Relocations: ; CHECK-NEXT: - Type: R_WASM_GLOBAL_INDEX_LEB diff --git a/lld/test/wasm/undefined-weak-call.s b/lld/test/wasm/undefined-weak-call.s --- a/lld/test/wasm/undefined-weak-call.s +++ b/lld/test/wasm/undefined-weak-call.s @@ -56,11 +56,11 @@ # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: # CHECK-NEXT: Flags: [ HAS_MAX ] -# CHECK-NEXT: Initial: 0x1 +# CHECK-NEXT: Minimum: 0x1 # CHECK-NEXT: Maximum: 0x1 # CHECK-NEXT: - Type: MEMORY # CHECK-NEXT: Memories: -# CHECK-NEXT: - Initial: 0x2 +# CHECK-NEXT: - Minimum: 0x2 # CHECK-NEXT: - Type: GLOBAL # CHECK-NEXT: Globals: # CHECK-NEXT: - Index: 0 diff --git a/lld/test/wasm/weak-alias-overide.ll b/lld/test/wasm/weak-alias-overide.ll --- a/lld/test/wasm/weak-alias-overide.ll +++ b/lld/test/wasm/weak-alias-overide.ll @@ -40,11 +40,11 @@ ; CHECK-NEXT: ElemType: FUNCREF ; CHECK-NEXT: Limits: ; CHECK-NEXT: Flags: [ HAS_MAX ] -; CHECK-NEXT: Initial: 0x3 +; CHECK-NEXT: Minimum: 0x3 ; CHECK-NEXT: Maximum: 0x3 ; CHECK-NEXT: - Type: MEMORY ; CHECK-NEXT: Memories: -; CHECK-NEXT: - Initial: 0x2 +; CHECK-NEXT: - Minimum: 0x2 ; CHECK-NEXT: - Type: GLOBAL ; CHECK-NEXT: Globals: ; CHECK-NEXT: - Index: 0 diff --git a/lld/test/wasm/weak-alias.ll b/lld/test/wasm/weak-alias.ll --- a/lld/test/wasm/weak-alias.ll +++ b/lld/test/wasm/weak-alias.ll @@ -37,11 +37,11 @@ ; CHECK-NEXT: ElemType: FUNCREF ; CHECK-NEXT: Limits: ; CHECK-NEXT: Flags: [ HAS_MAX ] -; CHECK-NEXT: Initial: 0x2 +; CHECK-NEXT: Minimum: 0x2 ; CHECK-NEXT: Maximum: 0x2 ; CHECK-NEXT: - Type: MEMORY ; CHECK-NEXT: Memories: -; CHECK-NEXT: - Initial: 0x2 +; CHECK-NEXT: - Minimum: 0x2 ; CHECK-NEXT: - Type: GLOBAL ; CHECK-NEXT: Globals: ; CHECK-NEXT: - Index: 0 @@ -151,7 +151,7 @@ ; RELOC-NEXT: Index: 0 ; RELOC-NEXT: ElemType: FUNCREF ; RELOC-NEXT: Limits: -; RELOC-NEXT: Initial: 0x2 +; RELOC-NEXT: Minimum: 0x2 ; RELOC-NEXT: - Module: env ; RELOC-NEXT: Field: __stack_pointer ; RELOC-NEXT: Kind: GLOBAL @@ -161,7 +161,7 @@ ; RELOC-NEXT: FunctionTypes: [ 0, 1, 1, 1, 1, 1 ] ; RELOC-NEXT: - Type: MEMORY ; RELOC-NEXT: Memories: -; RELOC-NEXT: - Initial: 0x0 +; RELOC-NEXT: - Minimum: 0x0 ; RELOC-NEXT: - Type: ELEM ; RELOC-NEXT: Segments: ; RELOC-NEXT: - Offset: diff --git a/lld/test/wasm/weak-symbols.s b/lld/test/wasm/weak-symbols.s --- a/lld/test/wasm/weak-symbols.s +++ b/lld/test/wasm/weak-symbols.s @@ -35,11 +35,11 @@ # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: # CHECK-NEXT: Flags: [ HAS_MAX ] -# CHECK-NEXT: Initial: 0x2 +# CHECK-NEXT: Minimum: 0x2 # CHECK-NEXT: Maximum: 0x2 # CHECK-NEXT: - Type: MEMORY # CHECK-NEXT: Memories: -# CHECK-NEXT: - Initial: 0x2 +# CHECK-NEXT: - Minimum: 0x2 # CHECK-NEXT: - Type: GLOBAL # CHECK-NEXT: Globals: # CHECK-NEXT: - Index: 0 diff --git a/lld/test/wasm/weak-undefined.s b/lld/test/wasm/weak-undefined.s --- a/lld/test/wasm/weak-undefined.s +++ b/lld/test/wasm/weak-undefined.s @@ -54,11 +54,11 @@ # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: # CHECK-NEXT: Flags: [ HAS_MAX ] -# CHECK-NEXT: Initial: 0x1 +# CHECK-NEXT: Minimum: 0x1 # CHECK-NEXT: Maximum: 0x1 # CHECK-NEXT: - Type: MEMORY # CHECK-NEXT: Memories: -# CHECK-NEXT: - Initial: 0x2 +# CHECK-NEXT: - Minimum: 0x2 # CHECK-NEXT: - Type: GLOBAL # CHECK-NEXT: Globals: # CHECK-NEXT: - Index: 0 diff --git a/lld/wasm/SyntheticSections.cpp b/lld/wasm/SyntheticSections.cpp --- a/lld/wasm/SyntheticSections.cpp +++ b/lld/wasm/SyntheticSections.cpp @@ -131,7 +131,7 @@ import.Field = "memory"; import.Kind = WASM_EXTERNAL_MEMORY; import.Memory.Flags = 0; - import.Memory.Initial = out.memorySec->numMemoryPages; + import.Memory.Minimum = out.memorySec->numMemoryPages; if (out.memorySec->maxMemoryPages != 0 || config->sharedMemory) { import.Memory.Flags |= WASM_LIMITS_FLAG_HAS_MAX; import.Memory.Maximum = out.memorySec->maxMemoryPages; diff --git a/lld/wasm/Writer.cpp b/lld/wasm/Writer.cpp --- a/lld/wasm/Writer.cpp +++ b/lld/wasm/Writer.cpp @@ -752,7 +752,7 @@ WasmLimits limits = {0, tableSize, 0}; if (WasmSym::indirectFunctionTable->isDefined() && !config->growableTable) { limits.Flags |= WASM_LIMITS_FLAG_HAS_MAX; - limits.Maximum = limits.Initial; + limits.Maximum = limits.Minimum; } WasmSym::indirectFunctionTable->setLimits(limits); } diff --git a/lld/wasm/WriterUtils.cpp b/lld/wasm/WriterUtils.cpp --- a/lld/wasm/WriterUtils.cpp +++ b/lld/wasm/WriterUtils.cpp @@ -67,7 +67,7 @@ static std::string toString(const llvm::wasm::WasmLimits &limits) { std::string ret; ret += "flags=0x" + std::to_string(limits.Flags); - ret += "; initial=" + std::to_string(limits.Initial); + ret += "; min=" + std::to_string(limits.Minimum); if (limits.Flags & WASM_LIMITS_FLAG_HAS_MAX) ret += "; max=" + std::to_string(limits.Maximum); return ret; @@ -191,7 +191,7 @@ void writeLimits(raw_ostream &os, const WasmLimits &limits) { writeU8(os, limits.Flags, "limits flags"); - writeUleb128(os, limits.Initial, "limits initial"); + writeUleb128(os, limits.Minimum, "limits min"); if (limits.Flags & WASM_LIMITS_FLAG_HAS_MAX) writeUleb128(os, limits.Maximum, "limits max"); } diff --git a/llvm/include/llvm/BinaryFormat/Wasm.h b/llvm/include/llvm/BinaryFormat/Wasm.h --- a/llvm/include/llvm/BinaryFormat/Wasm.h +++ b/llvm/include/llvm/BinaryFormat/Wasm.h @@ -63,7 +63,7 @@ struct WasmLimits { uint8_t Flags; - uint64_t Initial; + uint64_t Minimum; uint64_t Maximum; }; diff --git a/llvm/include/llvm/ObjectYAML/WasmYAML.h b/llvm/include/llvm/ObjectYAML/WasmYAML.h --- a/llvm/include/llvm/ObjectYAML/WasmYAML.h +++ b/llvm/include/llvm/ObjectYAML/WasmYAML.h @@ -46,7 +46,7 @@ struct Limits { LimitFlags Flags; - yaml::Hex32 Initial; + yaml::Hex32 Minimum; yaml::Hex32 Maximum; }; diff --git a/llvm/lib/MC/WasmObjectWriter.cpp b/llvm/lib/MC/WasmObjectWriter.cpp --- a/llvm/lib/MC/WasmObjectWriter.cpp +++ b/llvm/lib/MC/WasmObjectWriter.cpp @@ -899,7 +899,7 @@ for (const wasm::WasmTable &Table : Tables) { encodeULEB128(Table.Type.ElemType, W->OS); encodeULEB128(Table.Type.Limits.Flags, W->OS); - encodeULEB128(Table.Type.Limits.Initial, W->OS); + encodeULEB128(Table.Type.Limits.Minimum, W->OS); if (Table.Type.Limits.Flags & wasm::WASM_LIMITS_FLAG_HAS_MAX) encodeULEB128(Table.Type.Limits.Maximum, W->OS); } diff --git a/llvm/lib/Object/WasmObjectFile.cpp b/llvm/lib/Object/WasmObjectFile.cpp --- a/llvm/lib/Object/WasmObjectFile.cpp +++ b/llvm/lib/Object/WasmObjectFile.cpp @@ -208,7 +208,7 @@ static wasm::WasmLimits readLimits(WasmObjectFile::ReadContext &Ctx) { wasm::WasmLimits Result; Result.Flags = readVaruint32(Ctx); - Result.Initial = readVaruint64(Ctx); + Result.Minimum = readVaruint64(Ctx); if (Result.Flags & wasm::WASM_LIMITS_FLAG_HAS_MAX) Result.Maximum = readVaruint64(Ctx); return Result; diff --git a/llvm/lib/ObjectYAML/WasmEmitter.cpp b/llvm/lib/ObjectYAML/WasmEmitter.cpp --- a/llvm/lib/ObjectYAML/WasmEmitter.cpp +++ b/llvm/lib/ObjectYAML/WasmEmitter.cpp @@ -117,7 +117,7 @@ static int writeLimits(const WasmYAML::Limits &Lim, raw_ostream &OS) { writeUint8(OS, Lim.Flags); - encodeULEB128(Lim.Initial, OS); + encodeULEB128(Lim.Minimum, OS); if (Lim.Flags & wasm::WASM_LIMITS_FLAG_HAS_MAX) encodeULEB128(Lim.Maximum, OS); return 0; diff --git a/llvm/lib/ObjectYAML/WasmYAML.cpp b/llvm/lib/ObjectYAML/WasmYAML.cpp --- a/llvm/lib/ObjectYAML/WasmYAML.cpp +++ b/llvm/lib/ObjectYAML/WasmYAML.cpp @@ -367,7 +367,7 @@ WasmYAML::Limits &Limits) { if (!IO.outputting() || Limits.Flags) IO.mapOptional("Flags", Limits.Flags); - IO.mapRequired("Initial", Limits.Initial); + IO.mapRequired("Minimum", Limits.Minimum); if (!IO.outputting() || Limits.Flags & wasm::WASM_LIMITS_FLAG_HAS_MAX) IO.mapOptional("Maximum", Limits.Maximum); } diff --git a/llvm/test/CodeGen/WebAssembly/call-indirect.ll b/llvm/test/CodeGen/WebAssembly/call-indirect.ll --- a/llvm/test/CodeGen/WebAssembly/call-indirect.ll +++ b/llvm/test/CodeGen/WebAssembly/call-indirect.ll @@ -22,7 +22,7 @@ ; OBJ-NEXT: Field: __linear_memory ; OBJ-NEXT: Kind: MEMORY ; OBJ-NEXT: Memory: -; OBJ-NEXT: Initial: 0x0 +; OBJ-NEXT: Minimum: 0x0 ; OBJ-NEXT: - Module: env ; OBJ-NEXT: Field: __indirect_function_table ; OBJ-NEXT: Kind: TABLE diff --git a/llvm/test/CodeGen/WebAssembly/function-pointer64.ll b/llvm/test/CodeGen/WebAssembly/function-pointer64.ll --- a/llvm/test/CodeGen/WebAssembly/function-pointer64.ll +++ b/llvm/test/CodeGen/WebAssembly/function-pointer64.ll @@ -48,7 +48,7 @@ ; YAML: Memory: ; YAML-NEXT: Flags: [ IS_64 ] -; YAML-NEXT: Initial: 0x1 +; YAML-NEXT: Minimum: 0x1 ; YAML: - Type: CODE ; YAML: - Type: R_WASM_TABLE_INDEX_SLEB64 diff --git a/llvm/test/MC/WebAssembly/assembler-binary.ll b/llvm/test/MC/WebAssembly/assembler-binary.ll --- a/llvm/test/MC/WebAssembly/assembler-binary.ll +++ b/llvm/test/MC/WebAssembly/assembler-binary.ll @@ -50,7 +50,7 @@ ; CHECK-NEXT: Field: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Memory: -; CHECK-NEXT: Initial: 0x0 +; CHECK-NEXT: Minimum: 0x0 ; CHECK-NEXT: - Module: env ; CHECK-NEXT: Field: bar ; CHECK-NEXT: Kind: FUNCTION diff --git a/llvm/test/MC/WebAssembly/call-indirect-relocs.s b/llvm/test/MC/WebAssembly/call-indirect-relocs.s --- a/llvm/test/MC/WebAssembly/call-indirect-relocs.s +++ b/llvm/test/MC/WebAssembly/call-indirect-relocs.s @@ -45,7 +45,7 @@ # BIN-NEXT: Field: __linear_memory # BIN-NEXT: Kind: MEMORY # BIN-NEXT: Memory: -# BIN-NEXT: Initial: 0x0 +# BIN-NEXT: Minimum: 0x0 # BIN-NEXT: - Type: FUNCTION # BIN-NEXT: FunctionTypes: [ 0 ] # BIN-NEXT: - Type: TABLE @@ -53,7 +53,7 @@ # BIN-NEXT: - Index: 0 # BIN-NEXT: ElemType: FUNCREF # BIN-NEXT: Limits: -# BIN-NEXT: Initial: 0x0 +# BIN-NEXT: Minimum: 0x0 # BIN-NEXT: - Type: CODE # BIN-NEXT: Relocations: # BIN-NEXT: - Type: R_WASM_TYPE_INDEX_LEB diff --git a/llvm/test/MC/WebAssembly/comdat.ll b/llvm/test/MC/WebAssembly/comdat.ll --- a/llvm/test/MC/WebAssembly/comdat.ll +++ b/llvm/test/MC/WebAssembly/comdat.ll @@ -41,7 +41,7 @@ ; CHECK-NEXT: Field: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Memory: -; CHECK-NEXT: Initial: 0x1 +; CHECK-NEXT: Minimum: 0x1 ; CHECK-NEXT: - Module: env ; CHECK-NEXT: Field: funcImport ; CHECK-NEXT: Kind: FUNCTION diff --git a/llvm/test/MC/WebAssembly/data-section.s b/llvm/test/MC/WebAssembly/data-section.s --- a/llvm/test/MC/WebAssembly/data-section.s +++ b/llvm/test/MC/WebAssembly/data-section.s @@ -51,7 +51,7 @@ # BIN-NEXT: Kind: MEMORY # BIN-NEXT: Memory: # BIN64-NEXT: Flags: [ IS_64 ] -# BIN-NEXT: Initial: 0x1 +# BIN-NEXT: Minimum: 0x1 # BIN-NEXT: - Type: FUNCTION # BIN-NEXT: FunctionTypes: [ 0 ] # BIN-NEXT: - Type: DATACOUNT diff --git a/llvm/test/MC/WebAssembly/global-ctor-dtor.ll b/llvm/test/MC/WebAssembly/global-ctor-dtor.ll --- a/llvm/test/MC/WebAssembly/global-ctor-dtor.ll +++ b/llvm/test/MC/WebAssembly/global-ctor-dtor.ll @@ -25,7 +25,7 @@ ; CHECK-NEXT: Field: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Memory: -; CHECK-NEXT: Initial: 0x1 +; CHECK-NEXT: Minimum: 0x1 ; CHECK-NEXT: - Module: env ; CHECK-NEXT: Field: func3 ; CHECK-NEXT: Kind: FUNCTION @@ -53,7 +53,7 @@ ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: ElemType: FUNCREF ; CHECK-NEXT: Limits: -; CHECK-NEXT: Initial: 0x2 +; CHECK-NEXT: Minimum: 0x2 ; CHECK-NEXT: - Type: FUNCTION ; CHECK-NEXT: FunctionTypes: [ 0, 1, 0, 1 ] ; CHECK-NEXT: - Type: ELEM diff --git a/llvm/test/MC/WebAssembly/reloc-pic.s b/llvm/test/MC/WebAssembly/reloc-pic.s --- a/llvm/test/MC/WebAssembly/reloc-pic.s +++ b/llvm/test/MC/WebAssembly/reloc-pic.s @@ -62,7 +62,7 @@ # CHECK-NEXT: Field: __linear_memory # CHECK-NEXT: Kind: MEMORY # CHECK-NEXT: Memory: -# CHECK-NEXT: Initial: 0x1 +# CHECK-NEXT: Minimum: 0x1 # CHECK-NEXT: - Module: env # CHECK-NEXT: Field: default_func # CHECK-NEXT: Kind: FUNCTION @@ -74,7 +74,7 @@ # CHECK-NEXT: Index: 0 # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: -# CHECK-NEXT: Initial: 0x1 +# CHECK-NEXT: Minimum: 0x1 # CHECK-NEXT: - Module: GOT.mem # CHECK-NEXT: Field: default_data # CHECK-NEXT: Kind: GLOBAL diff --git a/llvm/test/MC/WebAssembly/tables.s b/llvm/test/MC/WebAssembly/tables.s --- a/llvm/test/MC/WebAssembly/tables.s +++ b/llvm/test/MC/WebAssembly/tables.s @@ -124,19 +124,19 @@ # BIN-NEXT: - Index: 0 # BIN-NEXT: ElemType: EXTERNREF # BIN-NEXT: Limits: -# BIN-NEXT: Initial: 0x0 +# BIN-NEXT: Minimum: 0x0 # BIN-NEXT: - Index: 1 # BIN-NEXT: ElemType: FUNCREF # BIN-NEXT: Limits: -# BIN-NEXT: Initial: 0x0 +# BIN-NEXT: Minimum: 0x0 # BIN-NEXT: - Index: 2 # BIN-NEXT: ElemType: FUNCREF # BIN-NEXT: Limits: -# BIN-NEXT: Initial: 0x0 +# BIN-NEXT: Minimum: 0x0 # BIN-NEXT: - Index: 3 # BIN-NEXT: ElemType: FUNCREF # BIN-NEXT: Limits: -# BIN-NEXT: Initial: 0x0 +# BIN-NEXT: Minimum: 0x0 # BIN: - Type: CODE # BIN-NEXT: Relocations: diff --git a/llvm/test/MC/WebAssembly/type-index.s b/llvm/test/MC/WebAssembly/type-index.s --- a/llvm/test/MC/WebAssembly/type-index.s +++ b/llvm/test/MC/WebAssembly/type-index.s @@ -37,7 +37,7 @@ # BIN-NEXT: Field: __linear_memory # BIN-NEXT: Kind: MEMORY # BIN-NEXT: Memory: -# BIN-NEXT: Initial: 0x0 +# BIN-NEXT: Minimum: 0x0 # BIN-NEXT: - Module: env # BIN-NEXT: Field: __indirect_function_table # BIN-NEXT: Kind: TABLE @@ -45,7 +45,7 @@ # BIN-NEXT: Index: 0 # BIN-NEXT: ElemType: FUNCREF # BIN-NEXT: Limits: -# BIN-NEXT: Initial: 0x0 +# BIN-NEXT: Minimum: 0x0 # BIN-NEXT: - Type: FUNCTION # BIN-NEXT: FunctionTypes: [ 0 ] # BIN-NEXT: - Type: CODE diff --git a/llvm/test/MC/WebAssembly/wasm64.s b/llvm/test/MC/WebAssembly/wasm64.s --- a/llvm/test/MC/WebAssembly/wasm64.s +++ b/llvm/test/MC/WebAssembly/wasm64.s @@ -148,7 +148,7 @@ # BIN-NEXT: Kind: MEMORY # BIN-NEXT: Memory: # BIN-NEXT: Flags: [ IS_64 ] -# BIN-NEXT: Initial: 0x1 +# BIN-NEXT: Minimum: 0x1 # BIN-NEXT: - Module: env # BIN-NEXT: Field: myglob64 # BIN-NEXT: Kind: GLOBAL diff --git a/llvm/test/MC/WebAssembly/weak-alias.s b/llvm/test/MC/WebAssembly/weak-alias.s --- a/llvm/test/MC/WebAssembly/weak-alias.s +++ b/llvm/test/MC/WebAssembly/weak-alias.s @@ -87,7 +87,7 @@ # CHECK-NEXT: Field: __linear_memory # CHECK-NEXT: Kind: MEMORY # CHECK-NEXT: Memory: -# CHECK-NEXT: Initial: 0x1 +# CHECK-NEXT: Minimum: 0x1 # CHECK-NEXT: - Module: env # CHECK-NEXT: Field: __indirect_function_table # CHECK-NEXT: Kind: TABLE @@ -95,7 +95,7 @@ # CHECK-NEXT: Index: 0 # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: -# CHECK-NEXT: Initial: 0x1 +# CHECK-NEXT: Minimum: 0x1 # CHECK-NEXT: - Type: FUNCTION # CHECK-NEXT: FunctionTypes: [ 0, 0, 0, 0, 0 ] # CHECK-NEXT: - Type: ELEM @@ -254,7 +254,7 @@ # REF-NEXT: Field: __linear_memory # REF-NEXT: Kind: MEMORY # REF-NEXT: Memory: -# REF-NEXT: Initial: 0x1 +# REF-NEXT: Minimum: 0x1 # REF-NEXT: - Module: env # REF-NEXT: Field: __indirect_function_table # REF-NEXT: Kind: TABLE @@ -262,7 +262,7 @@ # REF-NEXT: Index: 0 # REF-NEXT: ElemType: FUNCREF # REF-NEXT: Limits: -# REF-NEXT: Initial: 0x1 +# REF-NEXT: Minimum: 0x1 # REF-NEXT: - Type: FUNCTION # REF-NEXT: FunctionTypes: [ 0, 0, 0, 0, 0 ] # REF-NEXT: - Type: ELEM diff --git a/llvm/test/Object/wasm-relocs-and-producers.yaml b/llvm/test/Object/wasm-relocs-and-producers.yaml --- a/llvm/test/Object/wasm-relocs-and-producers.yaml +++ b/llvm/test/Object/wasm-relocs-and-producers.yaml @@ -24,7 +24,7 @@ Field: __linear_memory Kind: MEMORY Memory: - Initial: 0x00000000 + Minimum: 0x00000000 - Module: env Field: __indirect_function_table Kind: TABLE @@ -32,7 +32,7 @@ Index: 0 ElemType: FUNCREF Limits: - Initial: 0x00000000 + Minimum: 0x00000000 - Type: FUNCTION FunctionTypes: [ 0 ] - Type: CODE diff --git a/llvm/test/ObjectYAML/wasm/data_section.yaml b/llvm/test/ObjectYAML/wasm/data_section.yaml --- a/llvm/test/ObjectYAML/wasm/data_section.yaml +++ b/llvm/test/ObjectYAML/wasm/data_section.yaml @@ -5,7 +5,7 @@ Sections: - Type: MEMORY Memories: - - Initial: 0x00000003 + - Minimum: 0x00000003 - Type: DATA Segments: - InitFlags: 0 diff --git a/llvm/test/ObjectYAML/wasm/elem_section.yaml b/llvm/test/ObjectYAML/wasm/elem_section.yaml --- a/llvm/test/ObjectYAML/wasm/elem_section.yaml +++ b/llvm/test/ObjectYAML/wasm/elem_section.yaml @@ -9,7 +9,7 @@ ElemType: FUNCREF Limits: Flags: [ HAS_MAX ] - Initial: 0x00000010 + Minimum: 0x00000010 Maximum: 0x00000011 - Type: ELEM Segments: diff --git a/llvm/test/ObjectYAML/wasm/import_memory_shared.yaml b/llvm/test/ObjectYAML/wasm/import_memory_shared.yaml --- a/llvm/test/ObjectYAML/wasm/import_memory_shared.yaml +++ b/llvm/test/ObjectYAML/wasm/import_memory_shared.yaml @@ -17,7 +17,7 @@ Kind: MEMORY Memory: Flags: [ HAS_MAX, IS_SHARED ] - Initial: 0x00000010 + Minimum: 0x00000010 Maximum: 0x00000011 ... @@ -32,6 +32,6 @@ # CHECK: Kind: MEMORY # CHECK: Memory: # CHECK: Flags: [ HAS_MAX, IS_SHARED ] -# CHECK: Initial: 0x10 +# CHECK: Minimum: 0x10 # CHECK: Maximum: 0x11 # CHECK: ... diff --git a/llvm/test/ObjectYAML/wasm/import_section.yaml b/llvm/test/ObjectYAML/wasm/import_section.yaml --- a/llvm/test/ObjectYAML/wasm/import_section.yaml +++ b/llvm/test/ObjectYAML/wasm/import_section.yaml @@ -26,7 +26,7 @@ Kind: MEMORY Memory: Flags: [ HAS_MAX ] - Initial: 0x00000010 + Minimum: 0x00000010 Maximum: 0x00000011 - Module: foo Field: imported_table @@ -36,7 +36,7 @@ ElemType: FUNCREF Limits: Flags: [ HAS_MAX ] - Initial: 0x00000020 + Minimum: 0x00000020 Maximum: 0x00000022 ... # CHECK: --- !WASM @@ -59,7 +59,7 @@ # CHECK: Kind: MEMORY # CHECK: Memory: # CHECK: Flags: [ HAS_MAX ] -# CHECK: Initial: 0x10 +# CHECK: Minimum: 0x10 # CHECK: Maximum: 0x11 # CHECK: - Module: foo # CHECK: Field: imported_table @@ -68,6 +68,6 @@ # CHECK: ElemType: FUNCREF # CHECK: Limits: # CHECK: Flags: [ HAS_MAX ] -# CHECK: Initial: 0x20 +# CHECK: Minimum: 0x20 # CHECK: Maximum: 0x22 # CHECK: ... diff --git a/llvm/test/ObjectYAML/wasm/memory_section.yaml b/llvm/test/ObjectYAML/wasm/memory_section.yaml --- a/llvm/test/ObjectYAML/wasm/memory_section.yaml +++ b/llvm/test/ObjectYAML/wasm/memory_section.yaml @@ -6,9 +6,9 @@ - Type: MEMORY Memories: - Flags: [ HAS_MAX ] - Initial: 0x00000002 + Minimum: 0x00000002 Maximum: 0x000000FF - - Initial: 0x00000003 + - Minimum: 0x00000003 ... # CHECK: --- !WASM # CHECK: FileHeader: @@ -17,7 +17,7 @@ # CHECK: - Type: MEMORY # CHECK: Memories: # CHECK: - Flags: [ HAS_MAX ] -# CHECK: Initial: 0x2 +# CHECK: Minimum: 0x2 # CHECK: Maximum: 0xFF -# CHECK: - Initial: 0x3 +# CHECK: - Minimum: 0x3 # CHECK: ... diff --git a/llvm/test/ObjectYAML/wasm/multiple-tables.yaml b/llvm/test/ObjectYAML/wasm/multiple-tables.yaml --- a/llvm/test/ObjectYAML/wasm/multiple-tables.yaml +++ b/llvm/test/ObjectYAML/wasm/multiple-tables.yaml @@ -18,7 +18,7 @@ Index: 0 ElemType: FUNCREF Limits: - Initial: 0x0 + Minimum: 0x0 - Type: FUNCTION FunctionTypes: [ 0 ] - Type: TABLE @@ -26,16 +26,16 @@ - Index: 1 ElemType: FUNCREF Limits: - Initial: 0x0 + Minimum: 0x0 - Index: 2 ElemType: EXTERNREF Limits: - Initial: 0x0 + Minimum: 0x0 - Index: 3 ElemType: FUNCREF Limits: Flags: [ HAS_MAX ] - Initial: 0x3 + Minimum: 0x3 Maximum: 0x3 - Type: EXPORT Exports: @@ -79,7 +79,7 @@ # CHECK-NEXT: Index: 0 # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: -# CHECK-NEXT: Initial: 0x0 +# CHECK-NEXT: Minimum: 0x0 # CHECK-NEXT: - Type: FUNCTION # CHECK-NEXT: FunctionTypes: [ 0 ] # CHECK-NEXT: - Type: TABLE @@ -87,16 +87,16 @@ # CHECK-NEXT: - Index: 1 # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: -# CHECK-NEXT: Initial: 0x0 +# CHECK-NEXT: Minimum: 0x0 # CHECK-NEXT: - Index: 2 # CHECK-NEXT: ElemType: EXTERNREF # CHECK-NEXT: Limits: -# CHECK-NEXT: Initial: 0x0 +# CHECK-NEXT: Minimum: 0x0 # CHECK-NEXT: - Index: 3 # CHECK-NEXT: ElemType: FUNCREF # CHECK-NEXT: Limits: # CHECK-NEXT: Flags: [ HAS_MAX ] -# CHECK-NEXT: Initial: 0x3 +# CHECK-NEXT: Minimum: 0x3 # CHECK-NEXT: Maximum: 0x3 # CHECK-NEXT: - Type: EXPORT # CHECK-NEXT: Exports: diff --git a/llvm/test/ObjectYAML/wasm/table_section.yaml b/llvm/test/ObjectYAML/wasm/table_section.yaml --- a/llvm/test/ObjectYAML/wasm/table_section.yaml +++ b/llvm/test/ObjectYAML/wasm/table_section.yaml @@ -9,7 +9,7 @@ ElemType: FUNCREF Limits: Flags: [ HAS_MAX ] - Initial: 0x00000010 + Minimum: 0x00000010 Maximum: 0x00000011 ... # CHECK: --- !WASM @@ -22,6 +22,6 @@ # CHECK: ElemType: FUNCREF # CHECK: Limits: # CHECK: Flags: [ HAS_MAX ] -# CHECK: Initial: 0x10 +# CHECK: Minimum: 0x10 # CHECK: Maximum: 0x11 # CHECK: ... diff --git a/llvm/test/tools/llvm-readobj/wasm/wasm-imports.test b/llvm/test/tools/llvm-readobj/wasm/wasm-imports.test --- a/llvm/test/tools/llvm-readobj/wasm/wasm-imports.test +++ b/llvm/test/tools/llvm-readobj/wasm/wasm-imports.test @@ -21,7 +21,7 @@ Field: __linear_memory Kind: MEMORY Memory: - Initial: 0x00000000 + Minimum: 0x00000000 - Module: env Field: __indirect_function_table Kind: TABLE @@ -29,7 +29,7 @@ Index: 0 ElemType: FUNCREF Limits: - Initial: 0x00000000 + Minimum: 0x00000000 - Module: red Field: foo Kind: FUNCTION diff --git a/llvm/tools/llvm-readobj/WasmDumper.cpp b/llvm/tools/llvm-readobj/WasmDumper.cpp --- a/llvm/tools/llvm-readobj/WasmDumper.cpp +++ b/llvm/tools/llvm-readobj/WasmDumper.cpp @@ -192,7 +192,7 @@ ListScope Group(W, "Memories"); for (const wasm::WasmLimits &Memory : Obj->memories()) { DictScope Group(W, "Memory"); - W.printNumber("InitialPages", Memory.Initial); + W.printNumber("MinPages", Memory.Minimum); if (Memory.Flags & wasm::WASM_LIMITS_FLAG_HAS_MAX) { W.printNumber("MaxPages", WasmSec.Offset); } diff --git a/llvm/tools/obj2yaml/wasm2yaml.cpp b/llvm/tools/obj2yaml/wasm2yaml.cpp --- a/llvm/tools/obj2yaml/wasm2yaml.cpp +++ b/llvm/tools/obj2yaml/wasm2yaml.cpp @@ -34,7 +34,7 @@ static WasmYAML::Limits makeLimits(const wasm::WasmLimits &Limits) { WasmYAML::Limits L; L.Flags = Limits.Flags; - L.Initial = Limits.Initial; + L.Minimum = Limits.Minimum; L.Maximum = Limits.Maximum; return L; }