[Vm-dev] [commit][2855] CogVM source as per VMMaker.oscog-eem.594.

commits at squeakvm.org commits at squeakvm.org
Tue Jan 28 23:05:55 UTC 2014


Revision: 2855
Author:   eliot
Date:     2014-01-28 15:05:51 -0800 (Tue, 28 Jan 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.594.

Stabilize generation so that implicitly default options cause the same
dead code elimination as explicit defaults.

Regenerate the CameraPlugin, ScratchPlugin, UnicodePlugin & WeDoPlugin with
the Spur metadata.

Modified Paths:
--------------
    branches/Cog/nscogsrc/vm/cointerp.c
    branches/Cog/nscogsrc/vm/cointerp.h
    branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
    branches/Cog/nscogsrc/vm/interp.h
    branches/Cog/nscogsrc/vm/vmCallback.h
    branches/Cog/spurstacksrc/vm/gcc3x-interp.c
    branches/Cog/spurstacksrc/vm/interp.c
    branches/Cog/spurstacksrc/vm/interp.h
    branches/Cog/spurstacksrc/vm/vmCallback.h
    branches/Cog/src/examplePlugins.ext
    branches/Cog/src/plugins/CameraPlugin/CameraPlugin.c
    branches/Cog/src/plugins/ScratchPlugin/ScratchPlugin.c
    branches/Cog/src/plugins/UnicodePlugin/UnicodePlugin.c
    branches/Cog/src/plugins/WeDoPlugin/WeDoPlugin.c
    branches/Cog/src/vm/cointerp.c
    branches/Cog/src/vm/cointerp.h
    branches/Cog/src/vm/cointerpmt.c
    branches/Cog/src/vm/cointerpmt.h
    branches/Cog/src/vm/gcc3x-cointerp.c
    branches/Cog/src/vm/gcc3x-cointerpmt.c
    branches/Cog/src/vm/interp.h
    branches/Cog/src/vm/vmCallback.h
    branches/Cog/stacksrc/vm/gcc3x-interp.c
    branches/Cog/stacksrc/vm/interp.c
    branches/Cog/stacksrc/vm/interp.h
    branches/Cog/stacksrc/vm/vmCallback.h

Property Changed:
----------------
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h

Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c	2014-01-27 20:38:08 UTC (rev 2854)
+++ branches/Cog/nscogsrc/vm/cointerp.c	2014-01-28 23:05:51 UTC (rev 2855)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b
    from
-	CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120
+	CoInterpreter VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2029,7 +2029,7 @@
 	/* 574 */ (void (*)(void))0,
 	/* 575 */ (void (*)(void))0,
  0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.592";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.594";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
 volatile int sendTrace;
 
@@ -16222,13 +16222,6 @@
 			return PrimErrInappropriate;
 		}
 		
-#    if IMMUTABILITY
-		if ((rcvrHdr & ImmutabilityBit) != 0) {
-			return PrimErrNoModification;
-		}
-
-#    endif /* IMMUTABILITY */
-
 		longAtput(rcvr, (((rcvrHdr | CompactClassMask) - CompactClassMask)) | ccIndex);
 	}
 	else {
@@ -16236,13 +16229,6 @@
 		/* Exchange the class pointer, which could make rcvr a root for argClass */
 
 		
-#    if IMMUTABILITY
-		if ((rcvrHdr & ImmutabilityBit) != 0) {
-			return PrimErrNoModification;
-		}
-
-#    endif /* IMMUTABILITY */
-
 		if (((((usqInt) rcvrHdr) >> 12) & 0x1F) != 0) {
 			longAtput(rcvr, ((rcvrHdr | CompactClassMask) - CompactClassMask));
 		}
@@ -25057,26 +25043,14 @@
 isOopImmutable(sqInt anOop)
 {
 	return ((anOop & 1))
-	 || (
-#  if IMMUTABILITY
-		((longAt(anOop)) & (hex(ImmutabilityBit))) != 0
-#  else /* IMMUTABILITY */
-		0
-#  endif /* IMMUTABILITY */
-		);
+	 || (0);
 }
 
 sqInt
 isOopMutable(sqInt anOop)
 {
 	return (!((anOop & 1)))
-	 && (!(
-#if IMMUTABILITY
-	((longAt(anOop)) & (hex(ImmutabilityBit))) != 0
-#else /* IMMUTABILITY */
-	0
-#endif /* IMMUTABILITY */
-	));
+	 && (!(0));
 }
 
 

Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h	2014-01-27 20:38:08 UTC (rev 2854)
+++ branches/Cog/nscogsrc/vm/cointerp.h	2014-01-28 23:05:51 UTC (rev 2855)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b
  */
 
 

Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c	2014-01-27 20:38:08 UTC (rev 2854)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c	2014-01-28 23:05:51 UTC (rev 2855)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b
    from
-	CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120
+	CoInterpreter VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2032,7 +2032,7 @@
 	/* 574 */ (void (*)(void))0,
 	/* 575 */ (void (*)(void))0,
  0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.592";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.594";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
 volatile int sendTrace;
 
@@ -16231,13 +16231,6 @@
 			return PrimErrInappropriate;
 		}
 		
-#    if IMMUTABILITY
-		if ((rcvrHdr & ImmutabilityBit) != 0) {
-			return PrimErrNoModification;
-		}
-
-#    endif /* IMMUTABILITY */
-
 		longAtput(rcvr, (((rcvrHdr | CompactClassMask) - CompactClassMask)) | ccIndex);
 	}
 	else {
@@ -16245,13 +16238,6 @@
 		/* Exchange the class pointer, which could make rcvr a root for argClass */
 
 		
-#    if IMMUTABILITY
-		if ((rcvrHdr & ImmutabilityBit) != 0) {
-			return PrimErrNoModification;
-		}
-
-#    endif /* IMMUTABILITY */
-
 		if (((((usqInt) rcvrHdr) >> 12) & 0x1F) != 0) {
 			longAtput(rcvr, ((rcvrHdr | CompactClassMask) - CompactClassMask));
 		}
@@ -25066,26 +25052,14 @@
 isOopImmutable(sqInt anOop)
 {
 	return ((anOop & 1))
-	 || (
-#  if IMMUTABILITY
-		((longAt(anOop)) & (hex(ImmutabilityBit))) != 0
-#  else /* IMMUTABILITY */
-		0
-#  endif /* IMMUTABILITY */
-		);
+	 || (0);
 }
 
 sqInt
 isOopMutable(sqInt anOop)
 {
 	return (!((anOop & 1)))
-	 && (!(
-#if IMMUTABILITY
-	((longAt(anOop)) & (hex(ImmutabilityBit))) != 0
-#else /* IMMUTABILITY */
-	0
-#endif /* IMMUTABILITY */
-	));
+	 && (!(0));
 }
 
 

Modified: branches/Cog/nscogsrc/vm/interp.h
===================================================================
--- branches/Cog/nscogsrc/vm/interp.h	2014-01-27 20:38:08 UTC (rev 2854)
+++ branches/Cog/nscogsrc/vm/interp.h	2014-01-28 23:05:51 UTC (rev 2855)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b
  */
 
 #define VM_PROXY_MAJOR 1

Modified: branches/Cog/nscogsrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nscogsrc/vm/vmCallback.h	2014-01-27 20:38:08 UTC (rev 2854)
+++ branches/Cog/nscogsrc/vm/vmCallback.h	2014-01-28 23:05:51 UTC (rev 2855)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.592 uuid: 98758c41-4bb5-4d45-87c9-77e5cf416120
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b
  */
 
 #define VM_CALLBACK_INC 1


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Sat Jan 25 12:25:08 PST 2014
   + Tue Jan 28 15:03:50 PST 2014

Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c	2014-01-27 20:38:08 UTC (rev 2854)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c	2014-01-28 23:05:51 UTC (rev 2855)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.593 uuid: fca10aeb-7680-4292-9224-890680da8f9a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b
    from
-	StackInterpreter VMMaker.oscog-eem.593 uuid: fca10aeb-7680-4292-9224-890680da8f9a
+	StackInterpreter VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.593 uuid: fca10aeb-7680-4292-9224-890680da8f9a " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.594 uuid: dc0cca0d-8f63-4da1-a647-94be0840104b " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1961,7 +1961,7 @@
  0 };
 char * breakSelector;
 sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.593]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.594]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -2038,22 +2038,10 @@
 	localSP = pointerForOop(GIV(stackPointer));
 	localFP = pointerForOop(GIV(framePointer));
 	/* begin fetchNextBytecode */
-	
-#  if MULTIPLEBYTECODESETS
-	currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#  else /* MULTIPLEBYTECODESETS */
 	currentBytecode = byteAtPointer(++localIP);
 
-#  endif /* MULTIPLEBYTECODESETS */
-
 	/* begin initExtensions */
 	
-#  if MULTIPLEBYTECODESETS
-	extA = (extB = 0);
-
-#  endif /* MULTIPLEBYTECODESETS */
-
 	while (1) {
 		bytecodeDispatchDebugHook();
 
@@ -2064,15 +2052,8 @@
 			{
 				VM_LABEL(0pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 0 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2083,15 +2064,8 @@
 			{
 				VM_LABEL(1pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 4 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2102,15 +2076,8 @@
 			{
 				VM_LABEL(2pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 8 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2121,15 +2088,8 @@
 			{
 				VM_LABEL(3pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 12 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2140,15 +2100,8 @@
 			{
 				VM_LABEL(4pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 16 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2159,15 +2112,8 @@
 			{
 				VM_LABEL(5pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 20 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2178,15 +2124,8 @@
 			{
 				VM_LABEL(6pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 24 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2197,15 +2136,8 @@
 			{
 				VM_LABEL(7pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 28 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2216,15 +2148,8 @@
 			{
 				VM_LABEL(8pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 32 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2235,15 +2160,8 @@
 			{
 				VM_LABEL(9pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 36 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2254,15 +2172,8 @@
 			{
 				VM_LABEL(10pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 40 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2273,15 +2184,8 @@
 			{
 				VM_LABEL(11pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 44 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2292,15 +2196,8 @@
 			{
 				VM_LABEL(12pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 48 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2311,15 +2208,8 @@
 			{
 				VM_LABEL(13pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 52 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2330,15 +2220,8 @@
 			{
 				VM_LABEL(14pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 56 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2349,15 +2232,8 @@
 			{
 				VM_LABEL(15pushReceiverVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushReceiverVariable: */
 				/* begin internalPush: */
 				longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxReceiver)) + (BaseHeaderSize)) + 60 /* (currentBytecode bitAnd: 15) << 2 */));
@@ -2371,15 +2247,8 @@
 
 				VM_LABEL(0pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(0pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2397,15 +2266,8 @@
 
 				VM_LABEL(1pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(1pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2423,15 +2285,8 @@
 
 				VM_LABEL(2pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(2pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2449,15 +2304,8 @@
 
 				VM_LABEL(3pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(3pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2475,15 +2323,8 @@
 
 				VM_LABEL(4pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(4pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2501,15 +2342,8 @@
 
 				VM_LABEL(5pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(5pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2527,15 +2361,8 @@
 
 				VM_LABEL(6pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(6pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2553,15 +2380,8 @@
 
 				VM_LABEL(7pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(7pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2579,15 +2399,8 @@
 
 				VM_LABEL(8pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(8pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2605,15 +2418,8 @@
 
 				VM_LABEL(9pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(9pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2631,15 +2437,8 @@
 
 				VM_LABEL(10pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(10pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2657,15 +2456,8 @@
 
 				VM_LABEL(11pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(11pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2683,15 +2475,8 @@
 
 				VM_LABEL(12pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(12pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2709,15 +2494,8 @@
 
 				VM_LABEL(13pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(13pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2735,15 +2513,8 @@
 
 				VM_LABEL(14pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(14pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2761,15 +2532,8 @@
 
 				VM_LABEL(15pushTemporaryVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushTemporaryVariable: */
 				VM_LABEL(15pushTemporaryVariable);
 				/* begin internalPush: */
@@ -2786,15 +2550,8 @@
 
 				VM_LABEL(0pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -2810,15 +2567,8 @@
 
 				VM_LABEL(1pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -2834,15 +2584,8 @@
 
 				VM_LABEL(2pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -2858,15 +2601,8 @@
 
 				VM_LABEL(3pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -2882,15 +2618,8 @@
 
 				VM_LABEL(4pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -2906,15 +2635,8 @@
 
 				VM_LABEL(5pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -2930,15 +2652,8 @@
 
 				VM_LABEL(6pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -2954,15 +2669,8 @@
 
 				VM_LABEL(7pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -2978,15 +2686,8 @@
 
 				VM_LABEL(8pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3002,15 +2703,8 @@
 
 				VM_LABEL(9pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3026,15 +2720,8 @@
 
 				VM_LABEL(10pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3050,15 +2737,8 @@
 
 				VM_LABEL(11pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3074,15 +2754,8 @@
 
 				VM_LABEL(12pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3098,15 +2771,8 @@
 
 				VM_LABEL(13pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3122,15 +2788,8 @@
 
 				VM_LABEL(14pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3146,15 +2805,8 @@
 
 				VM_LABEL(15pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3170,15 +2822,8 @@
 
 				VM_LABEL(16pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3194,15 +2839,8 @@
 
 				VM_LABEL(17pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3218,15 +2856,8 @@
 
 				VM_LABEL(18pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3242,15 +2873,8 @@
 
 				VM_LABEL(19pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3266,15 +2890,8 @@
 
 				VM_LABEL(20pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3290,15 +2907,8 @@
 
 				VM_LABEL(21pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3314,15 +2924,8 @@
 
 				VM_LABEL(22pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3338,15 +2941,8 @@
 
 				VM_LABEL(23pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3362,15 +2958,8 @@
 
 				VM_LABEL(24pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3386,15 +2975,8 @@
 
 				VM_LABEL(25pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3410,15 +2992,8 @@
 
 				VM_LABEL(26pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3434,15 +3009,8 @@
 
 				VM_LABEL(27pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3458,15 +3026,8 @@
 
 				VM_LABEL(28pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3482,15 +3043,8 @@
 
 				VM_LABEL(29pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3506,15 +3060,8 @@
 
 				VM_LABEL(30pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3530,15 +3077,8 @@
 
 				VM_LABEL(31pushLiteralConstantBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralConstant: */
 				/* begin internalPush: */
 				/* begin literal: */
@@ -3557,15 +3097,8 @@
 
 				VM_LABEL(0pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(0pushLiteralVariable);
 				
@@ -3602,15 +3135,8 @@
 
 				VM_LABEL(1pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(1pushLiteralVariable);
 				
@@ -3647,15 +3173,8 @@
 
 				VM_LABEL(2pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(2pushLiteralVariable);
 				
@@ -3692,15 +3211,8 @@
 
 				VM_LABEL(3pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(3pushLiteralVariable);
 				
@@ -3737,15 +3249,8 @@
 
 				VM_LABEL(4pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(4pushLiteralVariable);
 				
@@ -3782,15 +3287,8 @@
 
 				VM_LABEL(5pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(5pushLiteralVariable);
 				
@@ -3827,15 +3325,8 @@
 
 				VM_LABEL(6pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(6pushLiteralVariable);
 				
@@ -3872,15 +3363,8 @@
 
 				VM_LABEL(7pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(7pushLiteralVariable);
 				
@@ -3917,15 +3401,8 @@
 
 				VM_LABEL(8pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(8pushLiteralVariable);
 				
@@ -3962,15 +3439,8 @@
 
 				VM_LABEL(9pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(9pushLiteralVariable);
 				
@@ -4007,15 +3477,8 @@
 
 				VM_LABEL(10pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(10pushLiteralVariable);
 				
@@ -4052,15 +3515,8 @@
 
 				VM_LABEL(11pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(11pushLiteralVariable);
 				
@@ -4097,15 +3553,8 @@
 
 				VM_LABEL(12pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(12pushLiteralVariable);
 				
@@ -4142,15 +3591,8 @@
 
 				VM_LABEL(13pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(13pushLiteralVariable);
 				
@@ -4187,15 +3629,8 @@
 
 				VM_LABEL(14pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(14pushLiteralVariable);
 				
@@ -4232,15 +3667,8 @@
 
 				VM_LABEL(15pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(15pushLiteralVariable);
 				
@@ -4277,15 +3705,8 @@
 
 				VM_LABEL(16pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(16pushLiteralVariable);
 				
@@ -4322,15 +3743,8 @@
 
 				VM_LABEL(17pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(17pushLiteralVariable);
 				
@@ -4367,15 +3781,8 @@
 
 				VM_LABEL(18pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(18pushLiteralVariable);
 				
@@ -4412,15 +3819,8 @@
 
 				VM_LABEL(19pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(19pushLiteralVariable);
 				
@@ -4457,15 +3857,8 @@
 
 				VM_LABEL(20pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(20pushLiteralVariable);
 				
@@ -4502,15 +3895,8 @@
 
 				VM_LABEL(21pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(21pushLiteralVariable);
 				
@@ -4547,15 +3933,8 @@
 
 				VM_LABEL(22pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(22pushLiteralVariable);
 				
@@ -4592,15 +3971,8 @@
 
 				VM_LABEL(23pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(23pushLiteralVariable);
 				
@@ -4637,15 +4009,8 @@
 
 				VM_LABEL(24pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(24pushLiteralVariable);
 				
@@ -4682,15 +4047,8 @@
 
 				VM_LABEL(25pushLiteralVariableBytecode);
 				/* begin fetchNextBytecode */
-				
-#        if MULTIPLEBYTECODESETS
-				currentBytecode = (byteAtPointer(++localIP)) + bytecodeSetSelector;
-
-#        else /* MULTIPLEBYTECODESETS */
 				currentBytecode = byteAtPointer(++localIP);
 
-#        endif /* MULTIPLEBYTECODESETS */
-
 				/* begin pushLiteralVariable: */
 				VM_LABEL(25pushLiteralVariable);
 				

@@ Diff output truncated at 50000 characters. @@


More information about the Vm-dev mailing list