Cleaning up function registers and setting up CR.

include/xenia/cpu/codegen/function_generator.h

@@ -41,6 +41,9 @@ public:
   llvm::Function* gen_fn();
   sdb::FunctionBlock* fn_block();
 
+  void PushInsertPoint();
+  void PopInsertPoint();
+
   void GenerateBasicBlocks();
   llvm::BasicBlock* GetBasicBlock(uint32_t address);
   llvm::BasicBlock* GetNextBasicBlock();
@@ -57,8 +60,7 @@ public:
 
   llvm::Value* cia_value();
 
-  llvm::Value* SetupRegisterLocal(uint32_t offset, llvm::Type* type,
-                                  const char* name);
+  llvm::Value* SetupLocal(llvm::Type* type, const char* name);
   void FillRegisters();
   void SpillRegisters();
 
@@ -69,8 +71,8 @@ public:
   llvm::Value* ctr_value();
   void update_ctr_value(llvm::Value* value);
 
-  llvm::Value* cr_value();
-  void update_cr_value(llvm::Value* value);
+  llvm::Value* cr_value(uint32_t n);
+  void update_cr_value(uint32_t n, llvm::Value* value);
 
   llvm::Value* gpr_value(uint32_t n);
   void update_gpr_value(uint32_t n, llvm::Value* value);
@@ -84,6 +86,12 @@ private:
   void GenerateSharedBlocks();
   void GenerateBasicBlock(sdb::FunctionBlock* block, llvm::BasicBlock* bb);
 
+  void setup_xer();
+  void setup_lr();
+  void setup_ctr();
+  void setup_cr(uint32_t n);
+  void setup_gpr(uint32_t n);
+
   xe_memory_ref         memory_;
   sdb::SymbolDatabase*  sdb_;
   sdb::FunctionSymbol*  fn_;
@@ -97,6 +105,9 @@ private:
   llvm::BasicBlock*     bb_;
   llvm::IRBuilder<>*    builder_;
 
+  std::vector<std::pair<llvm::BasicBlock*, llvm::BasicBlock::iterator> >
+      insert_points_;
+
   std::map<uint32_t, llvm::BasicBlock*> bbs_;
 
   // Address of the instruction being generated.
@@ -109,7 +120,7 @@ private:
     llvm::Value*  xer;
     llvm::Value*  lr;
     llvm::Value*  ctr;
-    llvm::Value*  cr;
+    llvm::Value*  cr[8];
     llvm::Value*  gpr[32];
   } locals_;
 };

include/xenia/cpu/ppc/instr.h

@@ -62,6 +62,18 @@ static inline int32_t XEEXTS16(uint32_t v) {
 static inline int32_t XEEXTS26(uint32_t v) {
   return v & 0x02000000 ? (int32_t)v | 0xFC000000 : (int32_t)(v);
 }
+static inline uint64_t XEMASK(uint32_t mstart, uint32_t mstop) {
+  // if mstart ≤ mstop then
+  //   mask[mstart:mstop] = ones
+  //   mask[all other bits] = zeros
+  // else
+  //   mask[mstart:63] = ones
+  //   mask[0:mstop] = ones
+  //   mask[all other bits] = zeros
+  uint64_t value =
+      (UINT64_MAX >> mstart) ^ ((mstop >= 63) ? 0 : UINT64_MAX >> (mstop + 1));
+  return mstart <= mstop ? value : ~value;
+}
 
 
 typedef struct {