Changeset 11Tweet

Timestamp:

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

Author:

Sam Hocevar

Message:

• fixed 64 bit issues here and there.

Location:

abuse/trunk/src

Files:

• include/lisp.hpp (modified) (8 diffs)
• lisp.cpp (modified) (14 diffs)
• sdlport/sound.cpp (modified) (1 diff)

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
 

abuse/trunk/src/lisp.cpp

@@ -213 +213 @@
 }
 
-lisp_1d_array *new_lisp_1d_array(ushort size, void *rest)
+lisp_1d_array *new_lisp_1d_array(int size, void *rest)
 {
   p_ref r11(rest);
@@ -262 +262 @@
 }
 
-lisp_fixed_point *new_lisp_fixed_point(long x)
+lisp_fixed_point *new_lisp_fixed_point(int32_t x)
 {
   lisp_fixed_point *p=(lisp_fixed_point *)lmalloc(sizeof(lisp_fixed_point),current_space);
@@ -271 +271 @@
 
 
-lisp_object_var *new_lisp_object_var(short number)
+lisp_object_var *new_lisp_object_var(int16_t number)
 {
   lisp_object_var *p=(lisp_object_var *)lmalloc(sizeof(lisp_object_var),current_space);
@@ -289 +289 @@
 }
 
-struct lisp_character *new_lisp_character(unsigned short ch)
+struct lisp_character *new_lisp_character(uint16_t ch)
 {
   lisp_character *c=(lisp_character *)lmalloc(sizeof(lisp_character),current_space);
@@ -299 +299 @@
 struct lisp_string *new_lisp_string(char *string)
 {
-  long size=sizeof(lisp_string)+strlen(string)+1;
+  int size=sizeof(lisp_string)+strlen(string)+1;
   if (size<8) size=8;
 
@@ -311 +311 @@
 struct lisp_string *new_lisp_string(char *string, int length)
 {
-  long size=sizeof(lisp_string)+length+1;
+  int size=sizeof(lisp_string)+length+1;
   if (size<8) size=8;
   lisp_string *s=(lisp_string *)lmalloc(size,current_space);
@@ -321 +321 @@
 }
 
-struct lisp_string *new_lisp_string(long length)
-{
-  long size=sizeof(lisp_string)+length;
+struct lisp_string *new_lisp_string(int length)
+{
+  int size=sizeof(lisp_string)+length;
   if (size<8) size=8;
   lisp_string *s=(lisp_string *)lmalloc(size,current_space);
@@ -343 +343 @@
 }
 #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)
 {
   int sp=current_space;
@@ -560 +560 @@
 }
 
-unsigned short lcharacter_value(void *c)
+uint16_t lcharacter_value(void *c)
 {
 #ifdef TYPE_CHECKING
@@ -1003 +1003 @@
 }
 
-lisp_symbol *add_c_object(void *symbol, short number)
+lisp_symbol *add_c_object(void *symbol, int16_t number)
 {
   need_perm_space("add_c_object");
@@ -1408 +1408 @@
                                 } else
                                 {
-                                  unsigned short ch=((lisp_character *)i)->ch;
+                                  uint16_t ch=((lisp_character *)i)->ch;
                                   dprintf("#\\");
                                   switch (ch)
@@ -2182 +2182 @@
 
 #ifndef NO_LIBS
-      long a=cash.reg_lisp_block(lcar(lcdr(arg_list)));
-      long b=cash.reg_lisp_block(block_list);
+      intptr_t a=cash.reg_lisp_block(lcar(lcdr(arg_list)));
+      intptr_t b=cash.reg_lisp_block(block_list);
       lisp_user_function *ufun=new_lisp_user_function(a,b);
 #else
@@ -2398 +2398 @@
                                 {
                                         char *gammapath;
-                                        gammapath = (char *)jmalloc( strlen( get_save_filename_prefix() ) + 10, "gammapath" );
+                                        gammapath = (char *)jmalloc( strlen( get_save_filename_prefix() ) + 9 + 1, "gammapath" );
                                         sprintf( gammapath, "%sgamma.lsp", get_save_filename_prefix() );
                                         fp = new jFILE( gammapath, "rb" );
@@ -2961 +2961 @@
   for (;f_arg;f_arg=CDR(f_arg))
   {
-    l_user_stack.push(((lisp_symbol *)CAR(f_arg))->value);
+    lisp_symbol *s = (lisp_symbol *)CAR(f_arg);
+    l_user_stack.push(s->value);
   }
 

abuse/trunk/src/sdlport/sound.cpp

@@ -112 +112 @@
         // Check for the sfx directory, disable sound if we can't find it.
         datadir = get_filename_prefix();
-        sfxdir = (char *)jmalloc( strlen( datadir ) + 6, "sfxdir" );
+        sfxdir = (char *)jmalloc( strlen( datadir ) + 5 + 1, "sfxdir" );
         sprintf( sfxdir, "%s/sfx/", datadir );
         if( (fd = fopen( sfxdir,"r" )) == NULL )