Index: include/llvm/Object/WindowsResource.h =================================================================== --- include/llvm/Object/WindowsResource.h +++ include/llvm/Object/WindowsResource.h @@ -45,14 +45,10 @@ namespace llvm { -class FileOutputBuffer; - namespace object { class WindowsResource; -enum class Machine { UNKNOWN, ARM, X64, X86 }; - class ResourceEntryRef { public: Error moveNext(bool &End); @@ -185,7 +181,8 @@ std::vector> StringTable; }; -Error writeWindowsResourceCOFF(StringRef OutputFile, Machine MachineType, +Error writeWindowsResourceCOFF(std::unique_ptr &OutputBuffer, + llvm::COFF::MachineTypes MachineType, const WindowsResourceParser &Parser); } // namespace object Index: lib/Object/WindowsResource.cpp =================================================================== --- lib/Object/WindowsResource.cpp +++ lib/Object/WindowsResource.cpp @@ -21,6 +21,8 @@ #include #include +using namespace llvm; + namespace llvm { namespace object { @@ -305,7 +307,8 @@ class WindowsResourceCOFFWriter { public: - WindowsResourceCOFFWriter(StringRef OutputFile, Machine MachineType, + WindowsResourceCOFFWriter(std::unique_ptr &OutputBuffer, + COFF::MachineTypes MachineType, const WindowsResourceParser &Parser, Error &E); Error write(); @@ -323,10 +326,10 @@ void writeDirectoryTree(); void writeDirectoryStringTable(); void writeFirstSectionRelocations(); - std::unique_ptr Buffer; - uint8_t *BufferStart; + std::unique_ptr &OutputBuffer; + char *BufferStart; uint64_t CurrentOffset = 0; - Machine MachineType; + COFF::MachineTypes MachineType; const WindowsResourceParser::TreeNode &Resources; const ArrayRef> Data; uint64_t FileSize; @@ -343,20 +346,14 @@ }; WindowsResourceCOFFWriter::WindowsResourceCOFFWriter( - StringRef OutputFile, Machine MachineType, + std::unique_ptr &OutputBuffer, COFF::MachineTypes MachineType, const WindowsResourceParser &Parser, Error &E) - : MachineType(MachineType), Resources(Parser.getTree()), - Data(Parser.getData()), StringTable(Parser.getStringTable()) { + : OutputBuffer(OutputBuffer), MachineType(MachineType), + Resources(Parser.getTree()), Data(Parser.getData()), + StringTable(Parser.getStringTable()) { performFileLayout(); - ErrorOr> BufferOrErr = - FileOutputBuffer::create(OutputFile, FileSize); - if (!BufferOrErr) { - E = errorCodeToError(BufferOrErr.getError()); - return; - } - - Buffer = std::move(*BufferOrErr); + OutputBuffer = MemoryBuffer::getNewMemBuffer(FileSize); } void WindowsResourceCOFFWriter::performFileLayout() { @@ -421,7 +418,7 @@ } Error WindowsResourceCOFFWriter::write() { - BufferStart = Buffer->getBufferStart(); + BufferStart = const_cast(OutputBuffer->getBufferStart()); writeCOFFHeader(); writeFirstSectionHeader(); @@ -431,10 +428,6 @@ writeSymbolTable(); writeStringTable(); - if (auto EC = Buffer->commit()) { - return errorCodeToError(EC); - } - return Error::success(); } @@ -443,13 +436,13 @@ auto *Header = reinterpret_cast(BufferStart); switch (MachineType) { - case Machine::ARM: + case COFF::IMAGE_FILE_MACHINE_ARMNT: Header->Machine = llvm::COFF::IMAGE_FILE_MACHINE_ARMNT; break; - case Machine::X64: + case COFF::IMAGE_FILE_MACHINE_AMD64: Header->Machine = llvm::COFF::IMAGE_FILE_MACHINE_AMD64; break; - case Machine::X86: + case COFF::IMAGE_FILE_MACHINE_I386: Header->Machine = llvm::COFF::IMAGE_FILE_MACHINE_I386; break; default: @@ -481,7 +474,8 @@ SectionOneHeader->Characteristics = llvm::COFF::IMAGE_SCN_ALIGN_1BYTES; SectionOneHeader->Characteristics += llvm::COFF::IMAGE_SCN_CNT_INITIALIZED_DATA; - SectionOneHeader->Characteristics += llvm::COFF::IMAGE_SCN_MEM_DISCARDABLE; + SectionOneHeader->Characteristics += + llvm::COFF::IMAGE_SCN_CNT_INITIALIZED_DATA; SectionOneHeader->Characteristics += llvm::COFF::IMAGE_SCN_MEM_READ; } @@ -715,13 +709,13 @@ Reloc->VirtualAddress = RelocationAddresses[i]; Reloc->SymbolTableIndex = NextSymbolIndex++; switch (MachineType) { - case Machine::ARM: + case COFF::IMAGE_FILE_MACHINE_ARMNT: Reloc->Type = llvm::COFF::IMAGE_REL_ARM_ADDR32NB; break; - case Machine::X64: + case COFF::IMAGE_FILE_MACHINE_AMD64: Reloc->Type = llvm::COFF::IMAGE_REL_AMD64_ADDR32NB; break; - case Machine::X86: + case COFF::IMAGE_FILE_MACHINE_I386: Reloc->Type = llvm::COFF::IMAGE_REL_I386_DIR32NB; break; default: @@ -731,10 +725,11 @@ } } -Error writeWindowsResourceCOFF(StringRef OutputFile, Machine MachineType, +Error writeWindowsResourceCOFF(std::unique_ptr &OutputBuffer, + COFF::MachineTypes MachineType, const WindowsResourceParser &Parser) { Error E = Error::success(); - WindowsResourceCOFFWriter Writer(OutputFile, MachineType, Parser, E); + WindowsResourceCOFFWriter Writer(OutputBuffer, MachineType, Parser, E); if (E) return E; return Writer.write(); Index: lib/Target/WebAssembly/WebAssemblyFastISel.cpp =================================================================== --- lib/Target/WebAssembly/WebAssemblyFastISel.cpp +++ lib/Target/WebAssembly/WebAssemblyFastISel.cpp @@ -63,12 +63,16 @@ public: // Innocuous defaults for our address. Address() : Kind(RegBase), Offset(0), GV(0) { Base.Reg = 0; } - void setKind(BaseKind K) { Kind = K; } + void setKind(BaseKind K) { + assert(!isSet() && "Can't change kind with non-zero base"); + Kind = K; + } BaseKind getKind() const { return Kind; } bool isRegBase() const { return Kind == RegBase; } bool isFIBase() const { return Kind == FrameIndexBase; } void setReg(unsigned Reg) { assert(isRegBase() && "Invalid base register access!"); + assert(Base.Reg == 0 && "Overwriting non-zero register"); Base.Reg = Reg; } unsigned getReg() const { @@ -77,6 +81,7 @@ } void setFI(unsigned FI) { assert(isFIBase() && "Invalid base frame index access!"); + assert(Base.FI == 0 && "Overwriting non-zero frame index"); Base.FI = FI; } unsigned getFI() const { @@ -91,6 +96,13 @@ int64_t getOffset() const { return Offset; } void setGlobalValue(const GlobalValue *G) { GV = G; } const GlobalValue *getGlobalValue() const { return GV; } + bool isSet() const { + if (isRegBase()) { + return Base.Reg != 0; + } else { + return Base.FI != 0; + } + } }; /// Keep a pointer to the WebAssemblySubtarget around so that we can make the @@ -297,6 +309,9 @@ DenseMap::iterator SI = FuncInfo.StaticAllocaMap.find(AI); if (SI != FuncInfo.StaticAllocaMap.end()) { + if (Addr.isSet()) { + return false; + } Addr.setKind(Address::FrameIndexBase); Addr.setFI(SI->second); return true; @@ -341,6 +356,9 @@ break; } } + if (Addr.isSet()) { + return false; + } Addr.setReg(getRegForValue(Obj)); return Addr.getReg() != 0; } Index: test/CodeGen/WebAssembly/offset-fastisel.ll =================================================================== --- /dev/null +++ test/CodeGen/WebAssembly/offset-fastisel.ll @@ -0,0 +1,100 @@ +; RUN: llc < %s -asm-verbose=false -disable-wasm-explicit-locals -fast-isel -fast-isel-abort=1 | FileCheck %s + +; TODO: Merge this with offset.ll when fast-isel matches better. + +target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128" +target triple = "wasm32-unknown-unknown-elf" + +; CHECK-LABEL: store_i8_with_variable_gep_offset: +; CHECK: i32.add $push[[L0:[0-9]+]]=, $0, $1{{$}} +; CHECK: i32.const $push[[L1:[0-9]+]]=, 0{{$}} +; CHECK: i32.store8 0($pop[[L0]]), $pop[[L1]]{{$}} +define void @store_i8_with_variable_gep_offset(i8* %p, i32 %idx) { + %s = getelementptr inbounds i8, i8* %p, i32 %idx + store i8 0, i8* %s + ret void +} + +; CHECK-LABEL: store_i8_with_array_alloca_gep: +; CHECK: i32.const $push[[L0:[0-9]+]]=, 0{{$}} +; CHECK: i32.load $push[[L1:[0-9]+]]=, __stack_pointer($pop[[L0]]){{$}} +; CHECK: i32.const $push[[L2:[0-9]+]]=, 32{{$}} +; CHECK: i32.sub $push{{[0-9]+}}=, $pop[[L1]], $pop[[L2]]{{$}} +; CHECK: i32.add $push[[L4:[0-9]+]]=, $pop{{[0-9]+}}, $0{{$}} +; CHECK: i32.const $push[[L5:[0-9]+]]=, 0{{$}} +; CHECK: i32.store8 0($pop[[L4]]), $pop[[L5]]{{$}} +define hidden void @store_i8_with_array_alloca_gep(i32 %idx) { + %A = alloca [30 x i8], align 16 + %s = getelementptr inbounds [30 x i8], [30 x i8]* %A, i32 0, i32 %idx + store i8 0, i8* %s, align 1 + ret void +} + +; CHECK-LABEL: store_i32_with_unfolded_gep_offset: +; CHECK: i32.const $push[[L0:[0-9]+]]=, 24{{$}} +; CHECK: i32.add $push[[L1:[0-9]+]]=, $0, $pop[[L0]]{{$}} +; CHECK: i32.const $push[[L2:[0-9]+]]=, 0{{$}} +; CHECK: i32.store 0($pop[[L1]]), $pop[[L2]]{{$}} +define void @store_i32_with_unfolded_gep_offset(i32* %p) { + %s = getelementptr i32, i32* %p, i32 6 + store i32 0, i32* %s + ret void +} + +; CHECK-LABEL: store_i32_with_folded_gep_offset: +; CHECK: i32.store 24($0), $pop{{[0-9]+$}} +define void @store_i32_with_folded_gep_offset(i32* %p) { + %s = getelementptr inbounds i32, i32* %p, i32 6 + store i32 0, i32* %s + ret void +} + +; CHECK-LABEL: load_i32_with_folded_gep_offset: +; CHECK: i32.load $push{{[0-9]+}}=, 24($0){{$}} +define i32 @load_i32_with_folded_gep_offset(i32* %p) { + %s = getelementptr inbounds i32, i32* %p, i32 6 + %t = load i32, i32* %s + ret i32 %t +} + +; CHECK-LABEL: store_i64_with_unfolded_gep_offset: +; CHECK: i32.const $push[[L0:[0-9]+]]=, 24{{$}} +; CHECK: i32.add $push[[L1:[0-9]+]]=, $0, $pop[[L0]]{{$}} +; CHECK: i64.const $push[[L2:[0-9]+]]=, 0{{$}} +; CHECK: i64.store 0($pop[[L1]]), $pop[[L2]]{{$}} +define void @store_i64_with_unfolded_gep_offset(i64* %p) { + %s = getelementptr i64, i64* %p, i32 3 + store i64 0, i64* %s + ret void +} + +; CHECK-LABEL: store_i8_with_folded_gep_offset: +; CHECK: i32.store8 24($0), $pop{{[0-9]+$}} +define void @store_i8_with_folded_gep_offset(i8* %p) { + %s = getelementptr inbounds i8, i8* %p, i32 24 + store i8 0, i8* %s + ret void +} + +; CHECK-LABEL: load_i8_u_with_folded_offset: +; CHECK: i32.load8_u $push{{[0-9]+}}=, 24($0){{$}} +define i32 @load_i8_u_with_folded_offset(i8* %p) { + %q = ptrtoint i8* %p to i32 + %r = add nuw i32 %q, 24 + %s = inttoptr i32 %r to i8* + %t = load i8, i8* %s + %u = zext i8 %t to i32 + ret i32 %u +} + +; TODO: this should be load8_s, need to fold sign-/zero-extend in fast-isel +; CHECK-LABEL: load_i8_s_with_folded_offset: +; CHECK: i32.load8_u $push{{[0-9]+}}=, 24($0){{$}} +define i32 @load_i8_s_with_folded_offset(i8* %p) { + %q = ptrtoint i8* %p to i32 + %r = add nuw i32 %q, 24 + %s = inttoptr i32 %r to i8* + %t = load i8, i8* %s + %u = sext i8 %t to i32 + ret i32 %u +} Index: tools/llvm-cvtres/llvm-cvtres.cpp =================================================================== --- tools/llvm-cvtres/llvm-cvtres.cpp +++ tools/llvm-cvtres/llvm-cvtres.cpp @@ -114,21 +114,21 @@ bool Verbose = InputArgs.hasArg(OPT_VERBOSE); - Machine MachineType; + COFF::MachineTypes MachineType; if (InputArgs.hasArg(OPT_MACHINE)) { std::string MachineString = InputArgs.getLastArgValue(OPT_MACHINE).upper(); - MachineType = StringSwitch(MachineString) - .Case("ARM", Machine::ARM) - .Case("X64", Machine::X64) - .Case("X86", Machine::X86) - .Default(Machine::UNKNOWN); - if (MachineType == Machine::UNKNOWN) + MachineType = StringSwitch(MachineString) + .Case("ARM", COFF::IMAGE_FILE_MACHINE_ARMNT) + .Case("X64", COFF::IMAGE_FILE_MACHINE_AMD64) + .Case("X86", COFF::IMAGE_FILE_MACHINE_I386) + .Default(COFF::IMAGE_FILE_MACHINE_UNKNOWN); + if (MachineType == COFF::IMAGE_FILE_MACHINE_UNKNOWN) reportError("Unsupported machine architecture"); } else { if (Verbose) outs() << "Machine architecture not specified; assumed X64.\n"; - MachineType = Machine::X64; + MachineType = COFF::IMAGE_FILE_MACHINE_AMD64; } std::vector InputFiles = InputArgs.getAllArgValues(OPT_INPUT); @@ -149,10 +149,10 @@ if (Verbose) { outs() << "Machine: "; switch (MachineType) { - case Machine::ARM: + case COFF::IMAGE_FILE_MACHINE_ARMNT: outs() << "ARM\n"; break; - case Machine::X86: + case COFF::IMAGE_FILE_MACHINE_I386: outs() << "X86\n"; break; default: @@ -196,8 +196,17 @@ Parser.printTree(errs()); } - error( - llvm::object::writeWindowsResourceCOFF(OutputFile, MachineType, Parser)); + std::unique_ptr OutputBuffer; + error(llvm::object::writeWindowsResourceCOFF(OutputBuffer, MachineType, + Parser)); + auto FileOrErr = + FileOutputBuffer::create(OutputFile, OutputBuffer->getBufferSize()); + if (!FileOrErr) + reportError(OutputFile, FileOrErr.getError()); + std::unique_ptr FileBuffer = std::move(*FileOrErr); + std::copy(OutputBuffer->getBufferStart(), OutputBuffer->getBufferEnd(), + FileBuffer->getBufferStart()); + error(FileBuffer->commit()); if (Verbose) { Expected> BinaryOrErr =