From 7765ad52e00034edd23bb09bade83d8b282f8040 Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Fri, 21 Sep 2007 19:52:30 +0200 Subject: Objective-C layer: Add functions for determining the Objective-C runtime used and for asking for the size of types by typespec. darcs-hash:197f36840c1568c5b3431833a0118d06729b9247 --- Lisp/defpackage.lisp | 8 ++++++++ Lisp/init.lisp | 8 +++++++- Lisp/libobjcl.lisp | 31 +++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) (limited to 'Lisp') diff --git a/Lisp/defpackage.lisp b/Lisp/defpackage.lisp index 0de0341..2a04fb6 100644 --- a/Lisp/defpackage.lisp +++ b/Lisp/defpackage.lisp @@ -41,4 +41,12 @@ ;; Metaclasses #:objective-c-class)) + +(defpackage #:mulk.objective-cl-features + (:nicknames #:objcl-features #:objective-cl-features #:mulk.objcl-features) + (:use) + (:export #:gnu-runtime + #:next-runtime)) + + #-(or cmu sbcl) (declaim (declaration values)) diff --git a/Lisp/init.lisp b/Lisp/init.lisp index 72d616f..a56d2e2 100644 --- a/Lisp/init.lisp +++ b/Lisp/init.lisp @@ -9,4 +9,10 @@ (unless (boundp '+yes+) (defconstant +yes+ (objcl-get-yes))) (unless (boundp '+no+) - (defconstant +no+ (objcl-get-no)))) + (defconstant +no+ (objcl-get-no))) + (unless (boundp '+runtime-type+) + (defconstant +runtime-type+ (runtime-type))) + (pushnew (case +runtime-type+ + ((:gnu) 'objcl-features:gnu-runtime) + ((:next) 'objcl-features:next-runtime)) + *features*)) diff --git a/Lisp/libobjcl.lisp b/Lisp/libobjcl.lisp index 1d14e8b..d2f3e3c 100644 --- a/Lisp/libobjcl.lisp +++ b/Lisp/libobjcl.lisp @@ -64,6 +64,17 @@ :pointer (obj :pointer)) +(defcfun ("objcl_get_runtime_type" %objcl-get-runtime-type) :string) + +(defcfun ("objcl_sizeof_type" %objcl-sizeof-type) :long + (typespec :string)) + +(defcfun ("objcl_sizeof_return_type" %objcl-sizeof-return-type) :long + (typespec :string)) + +(defcfun ("objcl_alignof_type" %objcl-alignof-type) :long + (typespec :string)) + (defcfun objcl-get-nil :pointer) (defcfun objcl-get-yes :long) (defcfun objcl-get-no :long) @@ -523,3 +534,23 @@ Returns: (VALUES typespec byte-position string-position)" byte-position) #-(or) nil string-position))) + + +;;;; (@* "Helper functions") +(defun sizeof (typespec) + (%objcl-sizeof-type typespec)) + +(defun alignof (typespec) + (%objcl-alignof-type typespec)) + +(defun return-type-sizeof (typespec) + (%objcl-sizeof-return-type typespec)) + +(defun runtime-type () + (let ((runtime (%objcl-get-runtime-type))) + (assert (member runtime '("GNU" "NeXT") :test #'string=) + (runtime) + "Unkown Objective-C runtime type ~S. Allowed: (\"GNU\" \"NeXT\")." + runtime) + (cond ((string= runtime "GNU") :gnu) + ((string= runtime "NeXT") :next)))) -- cgit v1.2.3