Merge mulk_benkard@ssh.phx.nearlyfreespeech.net:/home/htdocs/code/mulklisp

1 files changed, 30 insertions, 0 deletions

diff --git a/MLKLexicalContext-MLKLLVMCompilation.mm b/MLKLexicalContext-MLKLLVMCompilation.mm
index 669c943..92efa23 100644
--- a/MLKLexicalContext-MLKLLVMCompilation.mm
+++ b/MLKLexicalContext-MLKLLVMCompilation.mm
@@ -77,6 +77,15 @@ id MLKDummyUseLLVMLexicalContext = nil;
                             PointerType::get(PointerType::get(PointerType::get(Type::Int8Ty, 0), 0), 0)));
 }
 
+-(Instruction *) closureDataLengthValueForSymbol:(id)name
+{
+  // The length cell isn't really a void** but an intptr_t*.
+  return (new IntToPtrInst (ConstantInt::get(Type::Int64Ty,
+                                             (uint64_t)[self closureDataLengthForSymbol:name],
+                                             false),
+                            PointerType::get(PointerType::get(Type::Int8Ty, 0), 0)));
+}
+
 -(Instruction *) globalBindingValueForSymbol:(id)name
 {
   return (new IntToPtrInst (ConstantInt::get(Type::Int64Ty,
@@ -113,6 +122,27 @@ id MLKDummyUseLLVMLexicalContext = nil;
                      pointerValue];
 }
 
+-(Value *) functionBindingValueForSymbol:(id)name
+{
+  return (Value *) [[self propertyForVariable:name
+                                          key:@"LLVM.function-binding"]
+                    pointerValue];
+}
+
+-(void) locallySetFunctionBindingValue:(Value *)value forSymbol:(id)name
+{
+  [self addShallowProperty:[NSValue valueWithPointer:value]
+               forVariable:name
+                       key:@"LLVM.function-binding"];
+}
+
+-(void) setFunctionBindingValue:(Value *)value forSymbol:(id)name
+{
+  [self setDeepProperty:[NSValue valueWithPointer:value]
+            forVariable:name
+                    key:@"LLVM.function-binding"];
+}
+
 // -(void) setFunctionCellValue:(Value *)cellPtr forSymbol:(id)name
 // {
 //   [self setDeepProperty:[NSValue valueWithPointer:cellPtr]