From 9dd55a80655780cc5e38937958106bdb0143e669 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 12 Nov 2015 06:10:03 +0000 Subject: [WebAssembly] Switch to MC for instruction printing. This encompasses several changes which are all interconnected: - Use the MC framework for printing almost all instructions. - AsmStrings are now live. - This introduces an indirection between LLVM vregs and WebAssembly registers, and a new pass, WebAssemblyRegNumbering, for computing a basic the mapping. This addresses some basic issues with argument registers and unused registers. - The way ARGUMENT instructions are handled no longer generates redundant get_local+set_local for every argument. This also changes the assembly syntax somewhat; most notably, MC's printing use sigils on label names, so those are no longer present, and push/pop now have a sigil to keep them unambiguous. The usage of set_local/get_local/$push/$pop will continue to evolve significantly. This patch is just one step of a larger change. llvm-svn: 252858 --- .../Target/WebAssembly/WebAssemblyMachineFunctionInfo.h | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'llvm/lib/Target/WebAssembly/WebAssemblyMachineFunctionInfo.h') diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyMachineFunctionInfo.h b/llvm/lib/Target/WebAssembly/WebAssemblyMachineFunctionInfo.h index bac0dfafcf3..81273c00471 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyMachineFunctionInfo.h +++ b/llvm/lib/Target/WebAssembly/WebAssemblyMachineFunctionInfo.h @@ -30,9 +30,11 @@ class WebAssemblyFunctionInfo final : public MachineFunctionInfo { std::vector Params; std::vector Results; + /// A mapping from CodeGen vreg index to WebAssembly register number. + std::vector WARegs; + public: - explicit WebAssemblyFunctionInfo(MachineFunction &MF) - : MF(MF) {} + explicit WebAssemblyFunctionInfo(MachineFunction &MF) : MF(MF) {} ~WebAssemblyFunctionInfo() override; void addParam(MVT VT) { Params.push_back(VT); } @@ -40,6 +42,17 @@ public: void addResult(MVT VT) { Results.push_back(VT); } const std::vector &getResults() const { return Results; } + + void initWARegs() { + assert(WARegs.empty()); + WARegs.resize(MF.getRegInfo().getNumVirtRegs(), -1u); + } + void setWAReg(unsigned VReg, unsigned WAReg) { + WARegs[TargetRegisterInfo::virtReg2Index(VReg)] = WAReg; + } + unsigned getWAReg(unsigned VReg) const { + return WARegs[TargetRegisterInfo::virtReg2Index(VReg)]; + } }; } // end namespace llvm -- cgit v1.2.3