[Scummvm-cvs-logs] CVS: residual/lua lauxlib.cpp,1.2,1.3 lmem.h,1.1,1.2 lparser.cpp,1.1,1.2 lstate.cpp,1.2,1.3 lstring.cpp,1.2,1.3 ltm.cpp,1.2,1.3 lundump.cpp,1.1,1.2

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/residual/lua
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15251

Modified Files:
	lauxlib.cpp lmem.h lparser.cpp lstate.cpp lstring.cpp ltm.cpp 
	lundump.cpp 
Log Message:
call malloc, free, realloc directly

Index: lauxlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua/lauxlib.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lauxlib.cpp	25 Dec 2004 18:23:07 -0000	1.2
+++ lauxlib.cpp	30 Dec 2004 07:37:12 -0000	1.3
@@ -6,6 +6,7 @@
 
 
 #include <stdarg.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 

Index: lmem.h
===================================================================
RCS file: /cvsroot/scummvm/residual/lua/lmem.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lmem.h	6 Oct 2004 19:07:53 -0000	1.1
+++ lmem.h	30 Dec 2004 07:37:12 -0000	1.2
@@ -24,13 +24,13 @@
 int luaM_growaux (void **block, unsigned long nelems, int size,
                        char *errormsg, unsigned long limit);
 
-#define luaM_free(b)	luaM_realloc((b), 0)
-#define luaM_malloc(t)	luaM_realloc(NULL, (t))
-#define luaM_new(t)          ((t *)luaM_malloc(sizeof(t)))
-#define luaM_newvector(n,t)  ((t *)luaM_malloc((n)*sizeof(t)))
+#define luaM_free(b)	free((b))
+#define luaM_malloc(t)	malloc((t))
+#define luaM_new(t)          ((t *)malloc(sizeof(t)))
+#define luaM_newvector(n,t)  ((t *)malloc((n)*sizeof(t)))
 #define luaM_growvector(old,n,t,e,l) \
           (luaM_growaux((void**)old,n,sizeof(t),e,l))
-#define luaM_reallocvector(v,n,t) ((t *)luaM_realloc(v,(n)*sizeof(t)))
+#define luaM_reallocvector(v,n,t) ((t *)realloc(v,(n)*sizeof(t)))
 
 
 #ifdef DEBUG

Index: lparser.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua/lparser.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lparser.cpp	6 Oct 2004 19:07:53 -0000	1.1
+++ lparser.cpp	30 Dec 2004 07:37:12 -0000	1.2
@@ -5,6 +5,7 @@
 */
 
 
+#include <stdlib.h>
 #include <stdio.h>
 
 #include "lauxlib.h"
@@ -476,7 +477,7 @@
 }
 
 
-static int fix_jump (LexState *ls, int pc, OpCode op, int n) {
+static int fixJump (LexState *ls, int pc, OpCode op, int n) {
   /* jump is relative to position following jump instruction */
   return fix_opcode(ls, pc, op, 0, n-(pc+JMPSIZE));
 }
@@ -497,8 +498,8 @@
     elseinit = fs->pc;
   }
   else
-    elseinit += fix_jump(ls, elseAdd, JMP, fs->pc);
-  fix_jump(ls, thenAdd, IFFJMP, elseinit);
+    elseinit += fixJump(ls, elseAdd, JMP, fs->pc);
+  fixJump(ls, thenAdd, IFFJMP, elseinit);
 }
 
 
@@ -689,7 +690,7 @@
       check_pc(fs, cond_size);
       memcpy(f->code+fs->pc, f->code+while_init, cond_size);
       luaO_memdown(f->code+while_init, f->code+cond_end, fs->pc-while_init);
-      while_init += JMPSIZE + fix_jump(ls, while_init, JMP, fs->pc-cond_size);
+      while_init += JMPSIZE + fixJump(ls, while_init, JMP, fs->pc-cond_size);
       fix_upjmp(ls, IFTUPJMP, while_init);
       return 1;
     }
@@ -906,7 +907,7 @@
     pc = SaveWordPop(ls);
     exp2(ls, v);
     lua_pushvar(ls, v);
-    fix_jump(ls, pc, (is_and?ONFJMP:ONTJMP), ls->fs->pc);
+    fixJump(ls, pc, (is_and?ONFJMP:ONTJMP), ls->fs->pc);
   }
 }
 

Index: lstate.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua/lstate.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lstate.cpp	25 Dec 2004 18:23:07 -0000	1.2
+++ lstate.cpp	30 Dec 2004 07:37:12 -0000	1.3
@@ -5,6 +5,7 @@
 */
 
 
+#include <stdlib.h>
 #include "lbuiltin.h"
 #include "ldo.h"
 #include "lauxlib.h"

Index: lstring.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua/lstring.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lstring.cpp	25 Dec 2004 18:23:07 -0000	1.2
+++ lstring.cpp	30 Dec 2004 07:37:13 -0000	1.3
@@ -5,6 +5,7 @@
 */
 
 
+#include <stdlib.h>
 #include <string.h>
 
 #include "lmem.h"

Index: ltm.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua/ltm.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ltm.cpp	25 Dec 2004 18:23:07 -0000	1.2
+++ ltm.cpp	30 Dec 2004 07:37:13 -0000	1.3
@@ -5,6 +5,7 @@
 */
 
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 

Index: lundump.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua/lundump.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lundump.cpp	6 Oct 2004 19:07:53 -0000	1.1
+++ lundump.cpp	30 Dec 2004 07:37:13 -0000	1.2
@@ -4,6 +4,7 @@
 ** See Copyright Notice in lua.h
 */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include "lauxlib.h"