From 3228e750be1a13cd37fe00ae7c4a746b19ed7230 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Tue, 12 Sep 2006 20:59:59 +0000 Subject: [PATCH] Reflect MachineConstantPoolEntry changes. llvm-svn: 30277 --- llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp b/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp index 91ae641c2e6d..0fe82fd6c844 100644 --- a/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp +++ b/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp @@ -861,8 +861,11 @@ void JITEmitter::emitConstantPool(MachineConstantPool *MCP) { const std::vector &Constants = MCP->getConstants(); if (Constants.empty()) return; - unsigned Size = Constants.back().Offset; - Size += TheJIT->getTargetData()->getTypeSize(Constants.back().Val->getType()); + MachineConstantPoolEntry CPE = Constants.back(); + unsigned Size = CPE.Offset; + const Type *Ty = CPE.isMachineConstantPoolEntry() + ? CPE.Val.ConstVal->getType() : CPE.Val.MachineCPVal->getType(); + Size += TheJIT->getTargetData()->getTypeSize(Ty); ConstantPoolBase = allocateSpace(Size, 1 << MCP->getConstantPoolAlignment()); ConstantPool = MCP; @@ -872,7 +875,13 @@ void JITEmitter::emitConstantPool(MachineConstantPool *MCP) { // Initialize the memory for all of the constant pool entries. for (unsigned i = 0, e = Constants.size(); i != e; ++i) { void *CAddr = (char*)ConstantPoolBase+Constants[i].Offset; - TheJIT->InitializeMemory(Constants[i].Val, CAddr); + if (Constants[i].isMachineConstantPoolEntry()) { + // FIXME: add support to lower machine constant pool values into bytes! + std::cerr << "Initialize memory with machine specific constant pool entry" + << " has not been implemented!\n"; + abort(); + } + TheJIT->InitializeMemory(Constants[i].Val.ConstVal, CAddr); } }