Author: eliot Date: 2011-09-05 10:27:38 -0700 (Mon, 05 Sep 2011) New Revision: 2490
Modified: branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/platforms/Cross/vm/sqAssert.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h Log: CogVM source as per VMMaker.oscog-eem.122.mcz. Make cogit's halt invoke warning, not error.
Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2011-08-23 00:22:53 UTC (rev 2489) +++ branches/Cog/nscogsrc/vm/cogit.c 2011-09-05 17:27:38 UTC (rev 2490) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGenerator VMMaker.oscog-eem.122 uuid: 3dcdc732-75f6-4bc4-934c-9d76770dfbb4 from - StackToRegisterMappingCogit VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + StackToRegisterMappingCogit VMMaker.oscog-eem.122 uuid: 3dcdc732-75f6-4bc4-934c-9d76770dfbb4 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.122 uuid: 3dcdc732-75f6-4bc4-934c-9d76770dfbb4 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -1662,7 +1662,7 @@ #define getCFramePointer() CFramePointer #define getCStackPointer() CStackPointer #define halt() warning("halt") -#define haltmsg(msg) error("halt: " msg) +#define haltmsg(msg) warning("halt: " msg) #define limitZony() ((CogMethod *)mzFreeStart) #define maybeConstant(sse) ((sse)->constant) #define methodBytesFreedSinceLastCompaction() methodBytesFreedSinceLastCompaction
Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2011-08-23 00:22:53 UTC (rev 2489) +++ branches/Cog/nscogsrc/vm/cogit.h 2011-09-05 17:27:38 UTC (rev 2490) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGenerator VMMaker.oscog-eem.122 uuid: 3dcdc732-75f6-4bc4-934c-9d76770dfbb4 */
Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2011-08-23 00:22:53 UTC (rev 2489) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2011-09-05 17:27:38 UTC (rev 2490) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGenerator VMMaker.oscog-eem.122 uuid: 3dcdc732-75f6-4bc4-934c-9d76770dfbb4 */
typedef struct {
Modified: branches/Cog/platforms/Cross/vm/sqAssert.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqAssert.h 2011-08-23 00:22:53 UTC (rev 2489) +++ branches/Cog/platforms/Cross/vm/sqAssert.h 2011-09-05 17:27:38 UTC (rev 2490) @@ -28,5 +28,3 @@ # define assertf(msg) (warning(#msg " " __stringifyNum(__LINE__)),0) # define PRODUCTION 0 #endif - -#define halt() warning("halt")
Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2011-08-23 00:22:53 UTC (rev 2489) +++ branches/Cog/src/vm/cogit.c 2011-09-05 17:27:38 UTC (rev 2490) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGenerator VMMaker.oscog-eem.122 uuid: 3dcdc732-75f6-4bc4-934c-9d76770dfbb4 from - StackToRegisterMappingCogit VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + StackToRegisterMappingCogit VMMaker.oscog-eem.122 uuid: 3dcdc732-75f6-4bc4-934c-9d76770dfbb4 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.122 uuid: 3dcdc732-75f6-4bc4-934c-9d76770dfbb4 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -1645,7 +1645,7 @@ #define getCFramePointer() CFramePointer #define getCStackPointer() CStackPointer #define halt() warning("halt") -#define haltmsg(msg) error("halt: " msg) +#define haltmsg(msg) warning("halt: " msg) #define limitZony() ((CogMethod *)mzFreeStart) #define maybeConstant(sse) ((sse)->constant) #define methodBytesFreedSinceLastCompaction() methodBytesFreedSinceLastCompaction
Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2011-08-23 00:22:53 UTC (rev 2489) +++ branches/Cog/src/vm/cogit.h 2011-09-05 17:27:38 UTC (rev 2490) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGenerator VMMaker.oscog-eem.122 uuid: 3dcdc732-75f6-4bc4-934c-9d76770dfbb4 */
Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2011-08-23 00:22:53 UTC (rev 2489) +++ branches/Cog/src/vm/cogmethod.h 2011-09-05 17:27:38 UTC (rev 2490) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGenerator VMMaker.oscog-eem.122 uuid: 3dcdc732-75f6-4bc4-934c-9d76770dfbb4 */
typedef struct {
vm-dev@lists.squeakfoundation.org