Changeset 501Tweet

Timestamp:

Apr 18, 2011, 3:22:27 AM (11 years ago)

Author:

Sam Hocevar

Message:

lisp: properly manage user functions and reactivate garbage collector.

Location:

abuse/trunk/src

Files:

• game.cpp (modified) (1 diff)
• lisp/lisp.cpp (modified) (11 diffs)
• lisp/lisp.h (modified) (2 diffs)
• lisp/lisp_gc.cpp (modified) (2 diffs)

abuse/trunk/src/game.cpp

@@ -2487 +2487 @@
 
         game_net_init(argc, argv);
-//        lisp_init(0x100000, 0x94000);
         lisp_init(0x80000, 0x94000);
-//        lisp_init(0x20000, 0x94000);
-//        lisp_init(0x100000, 0x10000);
 
         dev_init(argc, argv);

abuse/trunk/src/lisp/lisp.cpp

@@ -180 +180 @@
 void *lmalloc(int size, int which_space)
 {
-  return malloc(size); /* XXX: temporary hack */
-
 #ifdef WORD_ALIGN
   size=(size+3)&(~3);
@@ -355 +353 @@
 }
 
-#ifdef NO_LIBS
-LUserFunction *new_lisp_user_function(void *arg_list, void *block_list)
+LUserFunction *new_lisp_user_function(LList *arg_list, LList *block_list)
 {
     PtrRef r1(arg_list), r2(block_list);
@@ -370 +367 @@
     return lu;
 }
-#else
-LUserFunction *new_lisp_user_function(intptr_t arg_list, intptr_t block_list)
-{
-    // Make sure all functions get defined in permanent space
-    int sp = current_space;
-    if (current_space != GC_SPACE)
-        current_space = PERM_SPACE;
-
-    size_t size = sizeof(LUserFunction);
-    if (size < sizeof(LRedirect))
-        size = sizeof(LRedirect);
-
-    LUserFunction *lu = (LUserFunction *)lmalloc(size, current_space);
-    lu->type = L_USER_FUNCTION;
-    lu->alist = arg_list;
-    lu->blist = block_list;
-
-    current_space = sp;
-
-    return lu;
-}
-#endif
 
 LSysFunction *new_lisp_sys_function(int min_args, int max_args, int fun_number)
@@ -2148 +2123 @@
     {
         LSymbol *symbol = (LSymbol *)CAR(arg_list);
+        PtrRef r1(symbol);
 #ifdef TYPE_CHECKING
         if (item_type(symbol) != L_SYMBOL)
@@ -2165 +2141 @@
         LObject *block_list = CDR(CDR(arg_list));
 
-#ifndef NO_LIBS
-        intptr_t a = cache.reg_lisp_block(lcar(lcdr(arg_list)));
-        intptr_t b = cache.reg_lisp_block(block_list);
-        LUserFunction *ufun = new_lisp_user_function(a, b);
-#else
-        LUserFunction *ufun = new_lisp_user_function(lcar(lcdr(arg_list)), block_list);
-#endif
+        LUserFunction *ufun = new_lisp_user_function((LList *)lcar(lcdr(arg_list)), (LList *)block_list);
         symbol->SetFunction(ufun);
         ret = symbol;
@@ -3002 +2972 @@
 void use_user_space(void *addr, long size)
 {
-    current_space = 2;
+    current_space = USER_SPACE;
     free_space[USER_SPACE] = space[USER_SPACE] = (uint8_t *)addr;
     space_size[USER_SPACE] = size;
@@ -3035 +3005 @@
 #endif
 
-#ifndef NO_LIBS
-    void *fun_arg_list = cache.lblock(fun->alist);
-    void *block_list = cache.lblock(fun->blist);
+    LList *fun_arg_list = fun->arg_list;
+    LList *block_list = fun->block_list;
     PtrRef r9(block_list), r10(fun_arg_list);
-#else
-    void *fun_arg_list = fun->arg_list;
-    void *block_list = fun->block_list;
-    PtrRef r9(block_list), r10(fun_arg_list);
-#endif
 
     // mark the start start, so we can restore when done
@@ -3053 +3017 @@
     PtrRef r19(arg_list);
 
-    for (f_arg = (LObject *)fun_arg_list; f_arg; f_arg = CDR(f_arg))
+    for (f_arg = fun_arg_list; f_arg; f_arg = CDR(f_arg))
     {
         LSymbol *s = (LSymbol *)CAR(f_arg);
@@ -3064 +3028 @@
         int i = new_start;
         // now push all the values we wish to gather
-        for (f_arg = (LObject *)fun_arg_list; f_arg; f_arg = CDR(f_arg))
+        for (f_arg = fun_arg_list; f_arg; f_arg = CDR(f_arg))
         {
             if (!arg_list)
@@ -3077 +3041 @@
 
         // now store all the values and put them into the symbols
-        for (f_arg = (LObject *)fun_arg_list; f_arg; f_arg = CDR(f_arg))
+        for (f_arg = fun_arg_list; f_arg; f_arg = CDR(f_arg))
             ((LSymbol *)CAR(f_arg))->SetValue((LObject *)l_user_stack.sdata[i++]);
 
@@ -3094 +3058 @@
     {
         ret = CAR(block_list)->Eval();
-        block_list = CDR(block_list);
+        block_list = (LList *)CDR(block_list);
     }
 
     long cur_stack = stack_start;
-    for (f_arg = (LObject *)fun_arg_list; f_arg; f_arg = CDR(f_arg))
+    for (f_arg = fun_arg_list; f_arg; f_arg = CDR(f_arg))
         ((LSymbol *)CAR(f_arg))->SetValue((LObject *)l_user_stack.sdata[cur_stack++]);
 

abuse/trunk/src/lisp/lisp.h

@@ -154 +154 @@
 struct LUserFunction : LObject
 {
-#ifndef NO_LIBS
-    intptr_t alist, blist;      // id for cached blocks
-#else
-    void *arg_list, *block_list;
-#endif
+    LList *arg_list, *block_list;
 };
 
@@ -238 +234 @@
 LSysFunction *new_lisp_c_bool(int min_args, int max_args, int fun_number);
 
-#ifdef NO_LIBS
-LUserFunction *new_lisp_user_function(void *arg_list, void *block_list);
-#else
-LUserFunction *new_lisp_user_function(intptr_t arg_list, intptr_t block_list);
-#endif
+LUserFunction *new_lisp_user_function(LList *arg_list, LList *block_list);
 
 LSysFunction *new_user_lisp_function(int min_args, int max_args, int fun_number);

abuse/trunk/src/lisp/lisp_gc.cpp

@@ -148 +148 @@
         break;
       case L_USER_FUNCTION:
-#ifndef NO_LIBS
-        ret = new_lisp_user_function(((LUserFunction *)x)->alist,
-                                     ((LUserFunction *)x)->blist);
-
-#else
-        {
-          LObject *arg = CollectObject(((LUserFunction *)x)->arg_list);
-          LObject *block = CollectObject(((LUserFunction *)x)->block_list);
-          ret = new_lisp_user_function(arg, block);
-        }
-#endif
-        break;
+      {
+        LUserFunction *fun = (LUserFunction *)x;
+        LList *arg = (LList *)CollectObject(fun->arg_list);
+        LList *block = (LList *)CollectObject(fun->block_list);
+        ret = new_lisp_user_function(arg, block);
+        break;
+      }
       case L_STRING:
         ret = LString::Create(lstring_value(x));
@@ -261 +256 @@
 void collect_space(int which_space) // should be tmp or permanent
 {
-  return; /* XXX: temporary hack */
-
   int old_space = current_space;
   cstart = space[which_space];