From 274b31d8f18e1003c61d5add875c6fdc72419ba6 Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Tue, 12 Aug 2008 11:21:51 +0200 Subject: Replace MLKCompiledProcedure with MLKCompiledClosure. --- GNUmakefile | 2 +- MLKCompiledClosure.h | 48 ++++++++++++++++++++ MLKCompiledClosure.m | 118 +++++++++++++++++++++++++++++++++++++++++++++++++ MLKCompiledProcedure.h | 41 ----------------- MLKCompiledProcedure.m | 98 ---------------------------------------- 5 files changed, 167 insertions(+), 140 deletions(-) create mode 100644 MLKCompiledClosure.h create mode 100644 MLKCompiledClosure.m delete mode 100644 MLKCompiledProcedure.h delete mode 100644 MLKCompiledProcedure.m diff --git a/GNUmakefile b/GNUmakefile index 6460914..bb43d64 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -49,7 +49,7 @@ endif ToiletKit_OBJC_FILES = functions.m globals.m MLKArray.m \ MLKBackquoteReader.m MLKBinding.m MLKCharacter.m \ - MLKCommaReader.m MLKCompiledProcedure.m MLKCons.m \ + MLKCommaReader.m MLKCompiledClosure.m MLKCons.m \ MLKDoubleFloat.m \ MLKDispatchingMacroCharacterReader.m \ MLKDynamicContext.m MLKEnvironment.m MLKFloat.m \ diff --git a/MLKCompiledClosure.h b/MLKCompiledClosure.h new file mode 100644 index 0000000..a4498d2 --- /dev/null +++ b/MLKCompiledClosure.h @@ -0,0 +1,48 @@ +/* -*- mode: objc; coding: utf-8 -*- */ +/* Toilet Lisp, a Common Lisp subset for the Étoilé runtime. + * Copyright (C) 2008 Matthias Andreas Benkard. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or (at + * your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "MLKFuncallable.h" +#import "MLKLexicalContext.h" +#import "MLKLexicalEnvironment.h" + +#import +#import + + +@interface MLKCompiledClosure : NSObject +{ + int _dataLength; + id (*_code)(); + id *_data; +} + +-(id) initWithCode:(void *)code + data:(id *)data + length:(int)dataLength; + ++(id) closureWithCode:(void *)code + data:(id *)data + length:(int)dataLength;; + +-(NSArray *) applyToArray:(NSArray *)arguments; + +-(NSString *) description; +-(NSString *) descriptionForLisp; + +-(void) dealloc; +@end diff --git a/MLKCompiledClosure.m b/MLKCompiledClosure.m new file mode 100644 index 0000000..35c8aca --- /dev/null +++ b/MLKCompiledClosure.m @@ -0,0 +1,118 @@ +/* -*- mode: objc; coding: utf-8 -*- */ +/* Toilet Lisp, a Common Lisp subset for the Étoilé runtime. + * Copyright (C) 2008 Matthias Andreas Benkard. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or (at + * your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "MLKCompiledClosure.h" + +#import "functions.h" +#import "globals.h" +#import "runtime-compatibility.h" +#import "util.h" + +#import +#import + +#import + + +@implementation MLKCompiledClosure +-(id) initWithCode:(void *)code + data:(id *)data + length:(int)dataLength +{ + int i; + + _data = data; + _dataLength = dataLength; + _code = code; + + for (i = 0; i < _dataLength; i++) + { + LRETAIN (_data[i]); + } + + return self; +} + ++(id) closureWithCode:(void *)code + data:(id *)data + length:(int)dataLength +{ + return LAUTORELEASE ([[self alloc] initWithCode:code data:data length:dataLength]); +} + +-(NSArray *) applyToArray:(NSArray *)arguments +{ + int argc = ([arguments count] + 2); + ffi_cif cif; + ffi_type *arg_types[argc]; + ffi_status status; + void *argv[argc]; + id argpointers[argc - 1]; + id return_value; + int i; + + arg_types[0] = &ffi_type_pointer; + argv[0] = &_data; + + for (i = 1; i < argc - 1; i++) + { + arg_types[i] = &ffi_type_pointer; + argpointers[i-1] = denullify([arguments objectAtIndex:i]); + argv[i] = &argpointers[i-1]; + } + + arg_types[argc - 1] = &ffi_type_pointer; + argv[argc - 1] = &MLKEndOfArgumentsMarker; + + status = ffi_prep_cif (&cif, FFI_DEFAULT_ABI, argc, &ffi_type_pointer, arg_types); + if (status != FFI_OK) + { + [NSException raise:@"MLKInvalidFFITypeException" + format:@"FFI type is invalid (this is probably a bug)."]; + } + + ffi_call (&cif, FFI_FN (_code), &return_value, (void**)argv); + + // FIXME + return [NSArray arrayWithObject:nullify(return_value)]; +} + +-(NSString *) description +{ + return MLKPrintToString (self); +} + +-(NSString *) descriptionForLisp +{ + return [NSString stringWithFormat:@"", self]; +} + +-(void) dealloc +{ + int i; + + [super dealloc]; + + // FIXME: Decrease refcount of _code. + for (i = 0; i < _dataLength; i++) + { + LRELEASE (_data[i]); + } + free (_data); +} +@end diff --git a/MLKCompiledProcedure.h b/MLKCompiledProcedure.h deleted file mode 100644 index 175c085..0000000 --- a/MLKCompiledProcedure.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- mode: objc; coding: utf-8 -*- */ -/* Toilet Lisp, a Common Lisp subset for the Étoilé runtime. - * Copyright (C) 2008 Matthias Andreas Benkard. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "MLKFuncallable.h" -#import "MLKLexicalContext.h" -#import "MLKLexicalEnvironment.h" - -#import -#import - - -@interface MLKCompiledProcedure : NSObject -{ - void *_code; -} - --(id) initWithCode:(void *)code; - --(NSArray *) applyToArray:(NSArray *)arguments; - --(NSString *) description; --(NSString *) descriptionForLisp; - --(void) dealloc; --(void) finalize; -@end diff --git a/MLKCompiledProcedure.m b/MLKCompiledProcedure.m deleted file mode 100644 index ee8664b..0000000 --- a/MLKCompiledProcedure.m +++ /dev/null @@ -1,98 +0,0 @@ -/* -*- mode: objc; coding: utf-8 -*- */ -/* Toilet Lisp, a Common Lisp subset for the Étoilé runtime. - * Copyright (C) 2008 Matthias Andreas Benkard. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "MLKCompiledProcedure.h" -#import "globals.h" -#import "util.h" - -#import - -#ifdef HAVE_FFI_H -#include -#elif HAVE_FFI_FFI_H -#include -#endif - -#include - - -@implementation MLKCompiledProcedure --(id) initWithCode:(void *)code -{ - self = [super init]; - _code = code; - return self; -} - --(NSArray *) applyToArray:(NSArray *)arguments -{ - int argc = ([arguments count] + 1); - ffi_cif cif; - ffi_type *arg_types[argc]; - ffi_status status; - id *argv[argc]; - id argpointers[argc - 1]; - id return_value; - int i; - - for (i = 0; i < argc - 1; i++) - { - arg_types[i] = &ffi_type_pointer; - argpointers[i] = denullify([arguments objectAtIndex:i]); - argv[i] = &argpointers[i]; - } - - arg_types[argc - 1] = &ffi_type_pointer; - argv[argc - 1] = &MLKEndOfArgumentsMarker; - - status = ffi_prep_cif (&cif, FFI_DEFAULT_ABI, argc, &ffi_type_pointer, arg_types); - if (status != FFI_OK) - { - [NSException raise:@"MLKInvalidFFITypeException" - format:@"FFI type is invalid (this is probably a bug)."]; - } - - ffi_call (&cif, FFI_FN (_code), &return_value, (void**)argv); - - // FIXME - return [NSArray arrayWithObject:nullify(return_value)]; -} - --(NSString *) description -{ - return MLKPrintToString(self); -} - --(NSString *) descriptionForLisp -{ - return [NSString stringWithFormat:@"", self]; -} - --(void) dealloc -{ - // FIXME: Can we really just use free() here? - free (_code); - [super dealloc]; -} - --(void) finalize -{ - // FIXME: Can we really just use free() here? - free (_code); -} -@end -- cgit v1.2.3