[Vm-dev] [commit][2763]
-memory and SQUEAK_MEMORY handle more than 31 bits of extra memory on 64-bit
architectures
commits at squeakvm.org
commits at squeakvm.org
Sat Aug 10 23:30:31 UTC 2013
Revision: 2763
Author: piumarta
Date: 2013-08-10 16:30:28 -0700 (Sat, 10 Aug 2013)
Log Message:
-----------
-memory and SQUEAK_MEMORY handle more than 31 bits of extra memory on 64-bit architectures
Modified Paths:
--------------
trunk/platforms/unix/ChangeLog
trunk/platforms/unix/vm/sqUnixMain.c
Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog 2013-08-01 23:28:32 UTC (rev 2762)
+++ trunk/platforms/unix/ChangeLog 2013-08-10 23:30:28 UTC (rev 2763)
@@ -1,3 +1,8 @@
+2013-08-10 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)>
+
+ * vm/sqUnixMain.c: extreMemory is 64 bits on LP64 architectures.
+ (strtobkm): Returns long instead of int.
+
2012-09-17 piumarta <com -dot- gmail -at- piumarta (backwards)>
* CMakeLists.txt: Add option '--image64'. With --image64
Modified: trunk/platforms/unix/vm/sqUnixMain.c
===================================================================
--- trunk/platforms/unix/vm/sqUnixMain.c 2013-08-01 23:28:32 UTC (rev 2762)
+++ trunk/platforms/unix/vm/sqUnixMain.c 2013-08-10 23:30:28 UTC (rev 2763)
@@ -27,7 +27,7 @@
/* Author: Ian Piumarta <ian.piumarta at squeakland.org>
*
- * Last edited: 2012-09-16 21:47:24 by piumarta on linux64
+ * Last edited: 2013-08-10 16:23:03 by piumarta on emilia
*/
#include "sq.h"
@@ -84,7 +84,7 @@
static int squeakArgCnt= 0;
static char **squeakArgVec= 0;
-static int extraMemory= 0;
+static long extraMemory= 0;
int useMmap= DefaultMmapSize * 1024 * 1024;
static int useItimer= 1; /* 0 to disable itimer-based clock */
@@ -940,10 +940,10 @@
/* built-in main vm module */
-static int strtobkm(const char *str)
+static long strtobkm(const char *str)
{
char *suffix;
- int value= strtol(str, &suffix, 10);
+ long value= strtol(str, &suffix, 10);
switch (*suffix)
{
case 'k': case 'K':
@@ -1310,9 +1310,9 @@
else
extraMemory= DefaultHeapSize * 1024 *1024;
# ifdef DEBUG_IMAGE
- printf("image size %d + heap size %d (useMmap = %d)\n", (int)sb.st_size, extraMemory, useMmap);
+ printf("image size %d + heap size %ld (useMmap = %d)\n", (int)sb.st_size, extraMemory, useMmap);
# endif
- extraMemory += (int)sb.st_size;
+ extraMemory += (long)sb.st_size;
readImageFromFileHeapSize(f, extraMemory);
sqImageFileClose(f);
break;
More information about the Vm-dev
mailing list