[Vm-dev] [commit][3560] CogVM sources as per VMMaker.oscog-eem.1644
commits at squeakvm.org
commits at squeakvm.org
Sat Jan 16 18:28:33 UTC 2016
Revision: 3560
Author: eliot
Date: 2016-01-16 10:28:32 -0800 (Sat, 16 Jan 2016)
Log Message:
-----------
CogVM sources as per VMMaker.oscog-eem.1644
Fix normalizePositive: for 64-bit Spur.
Modified Paths:
--------------
branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c
branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c
===================================================================
--- branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c 2016-01-16 16:48:03 UTC (rev 3559)
+++ branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c 2016-01-16 18:28:32 UTC (rev 3560)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1644 uuid: 937e3a17-80a3-4def-ad31-64ecf88b41f9
from
- LargeIntegersPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
+ LargeIntegersPlugin VMMaker.oscog-eem.1644 uuid: 937e3a17-80a3-4def-ad31-64ecf88b41f9
*/
-static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
+static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.1644 uuid: 937e3a17-80a3-4def-ad31-64ecf88b41f9 " __DATE__ ;
@@ -170,9 +170,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "LargeIntegers v1.5 VMMaker.oscog-eem.1602 (i)"
+ "LargeIntegers v1.5 VMMaker.oscog-eem.1644 (i)"
#else
- "LargeIntegers v1.5 VMMaker.oscog-eem.1602 (e)"
+ "LargeIntegers v1.5 VMMaker.oscog-eem.1644 (e)"
#endif
;
static const int orOpIndex = 1;
@@ -2205,17 +2205,19 @@
sLen = ((MaxSmallInteger) > 0x3FFFFFFF
? 8
: 4);
- if ((len <= sLen)
- && ((pointer[sLen - 1]) <= ((((usqInt) (((MaxSmallInteger) < 0
- ? 0 - (MaxSmallInteger)
- : MaxSmallInteger))) >> ((sLen - 1) * 8)) & 0xFF))) {
+ if (len <= sLen) {
+ if ((len < sLen)
+ || ((pointer[sLen - 1]) <= ((((usqInt) (((MaxSmallInteger) < 0
+ ? 0 - (MaxSmallInteger)
+ : MaxSmallInteger))) >> ((sLen - 1) * 8)) & 0xFF))) {
- /* If so, return its SmallInt value */
- val = pointer[(len -= 1)];
- for (i = (len - 1); i >= 0; i += -1) {
- val = (val * 256) + (pointer[i]);
+ /* If so, return its SmallInt value */
+ val = pointer[(len -= 1)];
+ for (i = (len - 1); i >= 0; i += -1) {
+ val = (val * 256) + (pointer[i]);
+ }
+ return integerObjectOf(val);
}
- return integerObjectOf(val);
}
if (len < oldLen) {
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Sat Jan 16 08:47:18 PST 2016
+ Sat Jan 16 10:28:05 PST 2016
Modified: branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c
===================================================================
--- branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c 2016-01-16 16:48:03 UTC (rev 3559)
+++ branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c 2016-01-16 18:28:32 UTC (rev 3560)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1644 uuid: 937e3a17-80a3-4def-ad31-64ecf88b41f9
from
- LargeIntegersPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
+ LargeIntegersPlugin VMMaker.oscog-eem.1644 uuid: 937e3a17-80a3-4def-ad31-64ecf88b41f9
*/
-static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
+static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.1644 uuid: 937e3a17-80a3-4def-ad31-64ecf88b41f9 " __DATE__ ;
@@ -170,9 +170,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "LargeIntegers v1.5 VMMaker.oscog-eem.1602 (i)"
+ "LargeIntegers v1.5 VMMaker.oscog-eem.1644 (i)"
#else
- "LargeIntegers v1.5 VMMaker.oscog-eem.1602 (e)"
+ "LargeIntegers v1.5 VMMaker.oscog-eem.1644 (e)"
#endif
;
static const int orOpIndex = 1;
@@ -2205,17 +2205,19 @@
sLen = ((MaxSmallInteger) > 0x3FFFFFFF
? 8
: 4);
- if ((len <= sLen)
- && ((pointer[sLen - 1]) <= ((((usqInt) (((MaxSmallInteger) < 0
- ? 0 - (MaxSmallInteger)
- : MaxSmallInteger))) >> ((sLen - 1) * 8)) & 0xFF))) {
+ if (len <= sLen) {
+ if ((len < sLen)
+ || ((pointer[sLen - 1]) <= ((((usqInt) (((MaxSmallInteger) < 0
+ ? 0 - (MaxSmallInteger)
+ : MaxSmallInteger))) >> ((sLen - 1) * 8)) & 0xFF))) {
- /* If so, return its SmallInt value */
- val = pointer[(len -= 1)];
- for (i = (len - 1); i >= 0; i += -1) {
- val = (val * 256) + (pointer[i]);
+ /* If so, return its SmallInt value */
+ val = pointer[(len -= 1)];
+ for (i = (len - 1); i >= 0; i += -1) {
+ val = (val * 256) + (pointer[i]);
+ }
+ return integerObjectOf(val);
}
- return integerObjectOf(val);
}
if (len < oldLen) {
More information about the Vm-dev
mailing list