Initial skeleton of Subzero.

src/IceCfg.cpp

Index: src/IceCfg.cpp
diff --git a/src/IceCfg.cpp b/src/IceCfg.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4e2fa87a2f85eccfe1df3a983ae2353ae0fdc85a
--- /dev/null
+++ b/src/IceCfg.cpp
@@ -0,0 +1,149 @@
+//===- subzero/src/IceCfg.cpp - Control flow graph implementation ---------===//
+//
+//                        The Subzero Code Generator
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the IceCfg class, including constant pool
+// management.
+//
+//===----------------------------------------------------------------------===//
+
+#include "IceCfg.h"
+#include "IceCfgNode.h"
+#include "IceDefs.h"
+#include "IceInst.h"
+#include "IceOperand.h"
+
+class IceConstantPool {
+public:
+  IceConstantPool(IceCfg *Cfg) : Cfg(Cfg) {}
+  IceConstantRelocatable *getOrAddRelocatable(IceType Type, const void *Handle,
+                                              int64_t Offset,
+                                              const IceString &Name) {
+    uint32_t Index = NameToIndex.translate(
+        KeyType(Type, std::pair<IceString, int64_t>(Name, Offset)));
+    if (Index >= RelocatablePool.size()) {
+      RelocatablePool.resize(Index + 1);
+      void *Handle = NULL;
+      RelocatablePool[Index] = IceConstantRelocatable::create(
+          Cfg, Index, Type, Handle, Offset, Name);
+    }
+    IceConstantRelocatable *Constant = RelocatablePool[Index];
+    assert(Constant);
+    return Constant;
+  }
+  uint32_t getSize() const { return RelocatablePool.size(); }
+  IceConstantRelocatable *getEntry(uint32_t Index) const {
+    assert(Index < RelocatablePool.size());
+    return RelocatablePool[Index];
+  }
+
+private:
+  // KeyType is a triple of {Type, Name, Offset}.
+  typedef std::pair<IceType, std::pair<IceString, int64_t> > KeyType;
+  // TODO: Cfg is being captured primarily for arena allocation for
+  // new IceConstants.  If IceConstants live beyond a function/Cfg,
+  // they need to be allocated from a global arena and there needs to
+  // be appropriate locking.
+  IceCfg *Cfg;
+  // Use IceValueTranslation<> to map (Name,Type) pairs to an index.
+  IceValueTranslation<KeyType> NameToIndex;
+  std::vector<IceConstantRelocatable *> RelocatablePool;
+};
+
+IceCfg::IceCfg()
+    : Str(this), Name(""), TestPrefix(""), Type(IceType_void),
+      IsInternal(false), HasError(false), ErrorMessage(""), Entry(NULL),
+      NextInstNumber(1) {

[JF, 2014/04/04 04:05:26]

Missing Allocator, Nodes, Variables, Args.

Can ConstantPool also be in the initializer list?

[Jim Stichnoth, 2014/04/06 02:16:09]

ConstantPool added.

It seems that Allocator can't be added to the initializer list because its copy
constructor is private (and "deleted"), so it gives a compiler error even if the
copy operation could ultimately be elided.

As for Nodes, Variables, and Args, they were intentionally omitted from the
initializer list because they are simple containers and I want them initialized
to the default empty container.  LLVM code appears to regularly omit explicit
initializers in these cases.

As such, I'd prefer to leave these fields off the explicit initializer list.

+  ConstantPool = new IceConstantPool(this);
+}
+
+IceCfg::~IceCfg() { delete ConstantPool; }
+
+void IceCfg::setError(const IceString &Message) {
+  HasError = true;
+  ErrorMessage = Message;
+  Str << "ICE translation error: " << ErrorMessage << "\n";
+}
+
+IceCfgNode *IceCfg::makeNode(const IceString &Name) {
+  uint32_t LabelIndex = Nodes.size();
+  IceCfgNode *Node = IceCfgNode::create(this, LabelIndex, Name);
+  Nodes.push_back(Node);
+  return Node;
+}
+
+// Create a new IceVariable with a particular type and an optional
+// name.  The Node argument is the node where the variable is defined.
+IceVariable *IceCfg::makeVariable(IceType Type, const IceCfgNode *Node,
+                                  const IceString &Name) {
+  uint32_t Index = Variables.size();
+  Variables.push_back(IceVariable::create(this, Type, Node, Index, Name));
+  return Variables[Index];
+}
+
+void IceCfg::addArg(IceVariable *Arg) {
+  Arg->setIsArg(this);
+  Args.push_back(Arg);
+}
+
+IceConstant *IceCfg::getConstantInt(IceType Type, uint64_t ConstantInt64) {
+  return IceConstantInteger::create(this, Type, ConstantInt64);
+}
+
+// TODO: Add float and double constants to the global constant pool,
+// instead of creating a new instance each time.
+IceConstant *IceCfg::getConstantFloat(float ConstantFloat) {
+  return IceConstantFloat::create(this, IceType_f32, ConstantFloat);
+}
+
+IceConstant *IceCfg::getConstantDouble(double ConstantDouble) {
+  return IceConstantDouble::create(this, IceType_f64, ConstantDouble);
+}
+
+IceConstant *IceCfg::getConstantSym(IceType Type, const void *Handle,
+                                    int64_t Offset, const IceString &Name,
+                                    bool SuppressMangling) {
+  IceConstantRelocatable *Const =
+      ConstantPool->getOrAddRelocatable(Type, Handle, Offset, Name);
+  Const->setSuppressMangling(SuppressMangling);
+  return Const;
+}
+
+void IceCfg::registerEdges() {
+  for (IceNodeList::iterator I = Nodes.begin(), E = Nodes.end(); I != E; ++I) {
+    (*I)->registerEdges();
+  }
+}
+
+// ======================== Dump routines ======================== //
+
+void IceCfg::dump() const {
+  Str.setCurrentNode(getEntryNode());
+  // Print function name+args
+  if (Str.isVerbose(IceV_Instructions)) {
+    Str << "define ";
+    if (getInternal())
+      Str << "internal ";
+    Str << Type << " @" << Name << "(";
+    for (uint32_t i = 0; i < Args.size(); ++i) {
+      if (i > 0)
+        Str << ", ";
+      Str << Args[i]->getType() << " " << Args[i];
+    }
+    Str << ") {\n";
+  }
+  Str.setCurrentNode(NULL);
+  // Print each basic block
+  for (IceNodeList::const_iterator I = Nodes.begin(), E = Nodes.end(); I != E;
+       ++I) {
+    (*I)->dump(Str);
+  }
+  if (Str.isVerbose(IceV_Instructions)) {
+    Str << "}\n";
+  }
+}