Changeset 11 for abuse/trunk/src/include/lisp.hppTweet

Timestamp:

Nov 10, 2005, 5:28:36 PM (17 years ago)

Author:

Sam Hocevar

Message:

• fixed 64 bit issues here and there.

File:

• abuse/trunk/src/include/lisp.hpp (modified) (8 diffs)

abuse/trunk/src/include/lisp.hpp

@@ -1 +1 @@
 #ifndef __LISP_HPP_
 #define __LISP_HPP_
+
+#include <stdint.h>
 
 #include "lisp_opt.hpp"
@@ -35 +37 @@
        L_FIXED_POINT, L_COLLECTED_OBJECT };
 
-typedef long ltype;    // make sure structures aren't packed differently on various compiler
+typedef uint64_t ltype;    // make sure structures aren't packed differently on various compiler
                        // and sure that word, etc are word alligned
 
@@ -83 +85 @@
   ltype type;
 #ifndef NO_LIBS
-  long alist,blist;      // id for cached blocks
+  intptr_t alist,blist;      // id for cached blocks
 #else
   void *arg_list,*block_list;
@@ -104 +106 @@
 {
   ltype type;
-  short pad;
-  unsigned short ch;
+  int16_t pad;
+  uint16_t ch;
 } ;
 
@@ -118 +120 @@
 {
   ltype type;
-  long x;
+  int32_t x;
 } ;
 
@@ -156 +158 @@
 
 void push_onto_list(void *object, void *&list);
-lisp_symbol *add_c_object(void *symbol, short number);
+lisp_symbol *add_c_object(void *symbol, int16_t number);
 lisp_symbol *add_c_function(char *name, short min_args, short max_args, short number);
 lisp_symbol *add_c_bool_fun(char *name, short min_args, short max_args, short number);
@@ -167 +169 @@
 lisp_number *new_lisp_number(long num);
 lisp_pointer *new_lisp_pointer(void *addr);
-lisp_character *new_lisp_character(unsigned short ch);
+lisp_character *new_lisp_character(uint16_t ch);
 lisp_string *new_lisp_string(char *string);
 lisp_string *new_lisp_string(char *string, int length);
-lisp_string *new_lisp_string(long length);
-lisp_fixed_point *new_lisp_fixed_point(long x);
-lisp_object_var *new_lisp_object_var(short number);
-lisp_1d_array   *new_lisp_1d_array(unsigned short size, void *rest);
+lisp_string *new_lisp_string(int length);
+lisp_fixed_point *new_lisp_fixed_point(int32_t x);
+lisp_object_var *new_lisp_object_var(int16_t number);
+lisp_1d_array   *new_lisp_1d_array(int size, void *rest);
 lisp_sys_function *new_lisp_sys_function(int min_args, int max_args, int fun_number);
 lisp_sys_function *new_lisp_c_function(int min_args, int max_args, int fun_number);
@@ -181 +183 @@
 lisp_user_function *new_lisp_user_function(void *arg_list, void *block_list);
 #else
-lisp_user_function *new_lisp_user_function(long arg_list, long block_list);
+lisp_user_function *new_lisp_user_function(intptr_t arg_list, intptr_t block_list);
 #endif