Vm-dev April 2016

vm-dev@lists.squeakfoundation.org

35 participants
202 discussions

[commit][3665] Squeak is actually not DPI aware (yet?).
by commits＠squeakvm.org 02 May '16

02 May '16

Revision: 3665 Author: topa Date: 2016-03-30 00:32:09 -0700 (Wed, 30 Mar 2016) Log Message: ----------- Squeak is actually not DPI aware (yet?). Modified Paths: -------------- branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.exe.manifest branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.exe.manifest branches/Cog/build.win32x86/squeak.cog.spur/Croquet.exe.manifest branches/Cog/build.win32x86/squeak.cog.spur/Squeak.exe.manifest branches/Cog/build.win32x86/squeak.cog.v3/Croquet.exe.manifest branches/Cog/build.win32x86/squeak.cog.v3/Squeak.exe.manifest branches/Cog/build.win32x86/squeak.stack.spur/Croquet.exe.manifest branches/Cog/build.win32x86/squeak.stack.spur/Squeak.exe.manifest branches/Cog/build.win32x86/squeak.stack.v3/Croquet.exe.manifest branches/Cog/build.win32x86/squeak.stack.v3/Squeak.exe.manifest Modified: branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.exe.manifest =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.exe.manifest 2016-03-29 20:18:32 UTC (rev 3664) +++ branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.exe.manifest 2016-03-30 07:32:09 UTC (rev 3665) @@ -12,7 +12,7 @@ <description>Newspeak Smalltalk Virtual Machine</description> <asmv3:application> <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> - <dpiAware>true</dpiAware> + <dpiAware>false</dpiAware> </asmv3:windowsSettings> </asmv3:application> <dependency> Modified: branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.exe.manifest =================================================================== --- branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.exe.manifest 2016-03-29 20:18:32 UTC (rev 3664) +++ branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.exe.manifest 2016-03-30 07:32:09 UTC (rev 3665) @@ -12,7 +12,7 @@ <description>Newspeak Smalltalk Virtual Machine</description> <asmv3:application> <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> - <dpiAware>true</dpiAware> + <dpiAware>false</dpiAware> </asmv3:windowsSettings> </asmv3:application> <dependency> Modified: branches/Cog/build.win32x86/squeak.cog.spur/Croquet.exe.manifest =================================================================== --- branches/Cog/build.win32x86/squeak.cog.spur/Croquet.exe.manifest 2016-03-29 20:18:32 UTC (rev 3664) +++ branches/Cog/build.win32x86/squeak.cog.spur/Croquet.exe.manifest 2016-03-30 07:32:09 UTC (rev 3665) @@ -12,7 +12,7 @@ <description>Croquet Smalltalk Virtual Machine</description> <asmv3:application> <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> - <dpiAware>true</dpiAware> + <dpiAware>false</dpiAware> </asmv3:windowsSettings> </asmv3:application> <dependency> Modified: branches/Cog/build.win32x86/squeak.cog.spur/Squeak.exe.manifest =================================================================== --- branches/Cog/build.win32x86/squeak.cog.spur/Squeak.exe.manifest 2016-03-29 20:18:32 UTC (rev 3664) +++ branches/Cog/build.win32x86/squeak.cog.spur/Squeak.exe.manifest 2016-03-30 07:32:09 UTC (rev 3665) @@ -12,7 +12,7 @@ <description>Squeak Smalltalk Virtual Machine</description> <asmv3:application> <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> - <dpiAware>true</dpiAware> + <dpiAware>false</dpiAware> </asmv3:windowsSettings> </asmv3:application> <dependency> Modified: branches/Cog/build.win32x86/squeak.cog.v3/Croquet.exe.manifest =================================================================== --- branches/Cog/build.win32x86/squeak.cog.v3/Croquet.exe.manifest 2016-03-29 20:18:32 UTC (rev 3664) +++ branches/Cog/build.win32x86/squeak.cog.v3/Croquet.exe.manifest 2016-03-30 07:32:09 UTC (rev 3665) @@ -12,7 +12,7 @@ <description>Croquet Smalltalk Virtual Machine</description> <asmv3:application> <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> - <dpiAware>true</dpiAware> + <dpiAware>false</dpiAware> </asmv3:windowsSettings> </asmv3:application> <dependency> Modified: branches/Cog/build.win32x86/squeak.cog.v3/Squeak.exe.manifest =================================================================== --- branches/Cog/build.win32x86/squeak.cog.v3/Squeak.exe.manifest 2016-03-29 20:18:32 UTC (rev 3664) +++ branches/Cog/build.win32x86/squeak.cog.v3/Squeak.exe.manifest 2016-03-30 07:32:09 UTC (rev 3665) @@ -12,7 +12,7 @@ <description>Squeak Smalltalk Virtual Machine</description> <asmv3:application> <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> - <dpiAware>true</dpiAware> + <dpiAware>false</dpiAware> </asmv3:windowsSettings> </asmv3:application> <dependency> Modified: branches/Cog/build.win32x86/squeak.stack.spur/Croquet.exe.manifest =================================================================== --- branches/Cog/build.win32x86/squeak.stack.spur/Croquet.exe.manifest 2016-03-29 20:18:32 UTC (rev 3664) +++ branches/Cog/build.win32x86/squeak.stack.spur/Croquet.exe.manifest 2016-03-30 07:32:09 UTC (rev 3665) @@ -12,7 +12,7 @@ <description>Croquet Smalltalk Virtual Machine</description> <asmv3:application> <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> - <dpiAware>true</dpiAware> + <dpiAware>false</dpiAware> </asmv3:windowsSettings> </asmv3:application> <dependency> Modified: branches/Cog/build.win32x86/squeak.stack.spur/Squeak.exe.manifest =================================================================== --- branches/Cog/build.win32x86/squeak.stack.spur/Squeak.exe.manifest 2016-03-29 20:18:32 UTC (rev 3664) +++ branches/Cog/build.win32x86/squeak.stack.spur/Squeak.exe.manifest 2016-03-30 07:32:09 UTC (rev 3665) @@ -12,7 +12,7 @@ <description>Squeak Smalltalk Virtual Machine</description> <asmv3:application> <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> - <dpiAware>true</dpiAware> + <dpiAware>false</dpiAware> </asmv3:windowsSettings> </asmv3:application> <dependency> Modified: branches/Cog/build.win32x86/squeak.stack.v3/Croquet.exe.manifest =================================================================== --- branches/Cog/build.win32x86/squeak.stack.v3/Croquet.exe.manifest 2016-03-29 20:18:32 UTC (rev 3664) +++ branches/Cog/build.win32x86/squeak.stack.v3/Croquet.exe.manifest 2016-03-30 07:32:09 UTC (rev 3665) @@ -12,7 +12,7 @@ <description>Croquet Smalltalk Virtual Machine</description> <asmv3:application> <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> - <dpiAware>true</dpiAware> + <dpiAware>false</dpiAware> </asmv3:windowsSettings> </asmv3:application> <dependency> Modified: branches/Cog/build.win32x86/squeak.stack.v3/Squeak.exe.manifest =================================================================== --- branches/Cog/build.win32x86/squeak.stack.v3/Squeak.exe.manifest 2016-03-29 20:18:32 UTC (rev 3664) +++ branches/Cog/build.win32x86/squeak.stack.v3/Squeak.exe.manifest 2016-03-30 07:32:09 UTC (rev 3665) @@ -12,7 +12,7 @@ <description>Squeak Smalltalk Virtual Machine</description> <asmv3:application> <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> - <dpiAware>true</dpiAware> + <dpiAware>false</dpiAware> </asmv3:windowsSettings> </asmv3:application> <dependency>

5 6

Stack and Cog v3 VMs for ARMv7?
by Phil (list) 02 May '16

02 May '16

I'm trying to build VMs inside an ARM qemu image running on Debian 8 armhf for oscogvm #3686 and have a couple of questions/issues. The first thing I ran into when building build.linux32ARM/squeak.stack.v3/build was that gcc is hard-coded to generate armv6 in the mvm script. Is this because the intention is to ensure that the resulting build works on the original Raspberry Pi or are there known issues with other architectures? I want (and for the particular ARM image I am building in, need) armv7. When I change to -march=armv7-a the VM builds without errors. But when I run it on my rpi2 the VM begins to startup (i.e. a window is created but never has a chance to redraw) and then segfaults with a Smalltalk stack trace. (this occurs both with a Cuis as well as Squeak 4.6 images) Is this a known problem? The next item is that there are no build.linux32ARM/squeak.cog.v3/* build targets. Is this a supported configuration? Thanks, Phil

3 4

VM Maker: VMMaker.oscog-eem.1854.mcz
by commits＠source.squeak.org 30 Apr '16

30 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1854.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1854 Author: eem Time: 30 April 2016, 1:13:30.569533 pm UUID: 69822805-79e9-43ee-a302-00e3536dc4fe Ancestors: VMMaker.oscog-nice.1853 Delete a broken assert. Rename a misnamed method. =============== Diff against VMMaker.oscog-nice.1853 =============== Item was changed: ----- Method: TMethod>>exitVar:label: (in category 'inlining') ----- exitVar: exitVar label: exitLabel "Replace each return statement in this method with an assignment to the exit variable followed by either a return or a goto to the given label. Answer if a goto was generated." "Optimization: If exitVar is nil, the return value of the inlined method is not being used, so don't add the assignment statement." | labelUsed map elisions eliminateReturnSelfs | labelUsed := false. map := Dictionary new. elisions := Set new. "Conceivably one might ^self from a struct class and mean it. In most cases though ^self means `get me outta here, fast'. So unless this method is from a VMStruct class, elide any ^self's" eliminateReturnSelfs := ((definingClass inheritsFrom: VMClass) and: [definingClass isStructClass]) not and: [returnType = #void or: [returnType = #sqInt]]. parseTree nodesDo: [:node | | replacement | node isReturn ifTrue: [self transformReturnSubExpression: node toAssignmentOf: exitVar andGoto: exitLabel unless: eliminateReturnSelfs into: [:rep :labelWasUsed| replacement := rep. labelWasUsed ifTrue: [labelUsed := true]]. "replaceNodesIn: is strictly top-down, so any replacement for ^expr ifTrue: [...^fu...] ifFalse: [...^bar...] will prevent replacement of either ^fu or ^bar. The corollary is that ^expr ifTrue: [foo] ifFalse: [^bar] must be transformed into expr ifTrue: [^foo] ifFalse: [^bar]" (node expression isConditionalSend and: [node expression hasExplicitReturn]) ifTrue: [elisions add: node. (node expression args reject: [:arg| arg endsWithReturn]) do: [:nodeNeedingReturn| self transformReturnSubExpression: nodeNeedingReturn statements last toAssignmentOf: exitVar andGoto: exitLabel unless: eliminateReturnSelfs into: [:rep :labelWasUsed| replacement := rep. labelWasUsed ifTrue: [labelUsed := true]]. map at: nodeNeedingReturn statements last put: replacement]] ifFalse: [map at: node put: (replacement ifNil: [TLabeledCommentNode new setComment: 'return ', node expression printString])]]]. map isEmpty ifTrue: [self deny: labelUsed. ^false]. "Now do a top-down replacement for all returns that should be mapped to assignments and gotos" parseTree replaceNodesIn: map. "Now it is safe to eliminate the returning ifs..." elisions isEmpty ifFalse: [| elisionMap | elisionMap := Dictionary new. elisions do: [:returnNode| elisionMap at: returnNode put: returnNode expression]. parseTree replaceNodesIn: elisionMap]. - "Afterwards all returns should be gone." - self deny: parseTree hasExplicitReturn. "Now flatten any new statement lists..." parseTree nodesDo: [:node| | list | (node isStmtList and: [node statements notEmpty and: [node statements last isStmtList]]) ifTrue: [list := node statements last statements. node statements removeLast; addAllLast: list]]. ^labelUsed! Item was changed: ----- Method: TParseNode>>collect: (in category 'enumerating') ----- collect: aBlock | nodes | + self halt. "This is a misnomer; should be deleted" nodes := OrderedCollection new. self nodesDo: [:n| (aBlock value: n) ifTrue: [nodes add: n]]. ^nodes! Item was added: + ----- Method: TParseNode>>select: (in category 'enumerating') ----- + select: aBlock + | nodes | + nodes := OrderedCollection new. + self nodesDo: [:n| (aBlock value: n) ifTrue: [nodes add: n]]. + ^nodes!

1 0

about mirror primitive and var-arg
by Nicolas Cellier 30 Apr '16

30 Apr '16

Hi, in initializePrimitiveTableForSqueak, I wonder why (111 genPrimitiveClass) has no specification of number of args when (110 genPrimitiveIdentical 1) has... They are both used by miror primitives ain't they? Should it be (110 genPrimitiveIdentica) instead? Same for (62 genPrimitiveSize 0) and (169 genPrimitiveNotIdentical 1).

1 1

[commit][3690] CogVM source as per VMMaker.oscog-nice.1853
by commits＠squeakvm.org 30 Apr '16

30 Apr '16

Revision: 3690 Author: eliot Date: 2016-04-30 10:58:20 -0700 (Sat, 30 Apr 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-nice.1853 Fix missing comparison operation in genPrimitiveIdentical on V3. This should fix Character = problem encounterd in Cuis. Comment concretizePrefetchAw, and store machineCode in last statement so as to avoid a -Wunused-value warning. Correct slip in primitiveMethodXray, the flags were not set in each caseOf: branch (thanks to -Wunused-value). Remove assert in classTagForClass: because ensureBehaviorHash: already does it. Modified Paths: -------------- branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cogitX64.c branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.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/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-04-29 13:58:43 UTC (rev 3689) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-04-30 17:58:20 UTC (rev 3690) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1851 uuid: a2b37448-8ea6-480e-aa07-e99d6de1744a + CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e */ Modified: branches/Cog/nsspur64src/vm/cogitX64.c =================================================================== --- branches/Cog/nsspur64src/vm/cogitX64.c 2016-04-29 13:58:43 UTC (rev 3689) +++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-04-30 17:58:20 UTC (rev 3690) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1851 uuid: a2b37448-8ea6-480e-aa07-e99d6de1744a + CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e from - StackToRegisterMappingCogit VMMaker.oscog-eem.1851 uuid: a2b37448-8ea6-480e-aa07-e99d6de1744a + StackToRegisterMappingCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1851 uuid: a2b37448-8ea6-480e-aa07-e99d6de1744a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -5236,9 +5236,9 @@ findMapLocationForMcpcinMethod(sqInt targetMcpc, CogMethod *cogMethod) { sqInt annotation; - usqInt map; + sqInt map; sqInt mapByte; - usqInt mcpc; + sqInt mcpc; mcpc = (0 ? (((usqInt)cogMethod)) + cbNoSwitchEntryOffset @@ -5322,7 +5322,7 @@ sqInt annotation; usqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result; assert((((cogMethod->cmType)) != CMMethod) @@ -5914,12 +5914,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -7159,7 +7159,7 @@ sqInt annotation; usqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result; mcpc = (0 @@ -7266,7 +7266,7 @@ sqInt hasYoungObjPtr; usqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt remappedMethod; sqInt result; sqInt val; @@ -7384,7 +7384,7 @@ CogMethod *cogMethod; usqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result; codeModified = 0; @@ -7464,7 +7464,7 @@ sqInt hasYoungObjPtr; usqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; usqInt pointer; sqInt result; sqInt val; @@ -7586,8 +7586,8 @@ usqInt map1; sqInt mapByte; sqInt mapByte1; - sqInt mcpc; - sqInt mcpc1; + usqInt mcpc; + usqInt mcpc1; sqInt result; sqInt result1; sqInt val; @@ -7744,7 +7744,7 @@ sqInt annotation; usqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result; sqInt val; @@ -8072,7 +8072,7 @@ CogMethod *cogMethod; usqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result; assert((((aCogMethod->cmType)) == CMMethod) @@ -8641,9 +8641,9 @@ printPCMapPairsFor(CogMethod *cogMethod) { sqInt annotation; - usqInt map; + sqInt map; unsigned char mapByte; - usqInt mcpc; + sqInt mcpc; sqInt value; mcpc = (0 @@ -8822,7 +8822,7 @@ sqLong callDelta; usqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqLong refDelta; sqInt result; @@ -9396,7 +9396,7 @@ CogMethod *cogMethod; usqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result; if (!(methodZoneBase)) { @@ -9839,7 +9839,7 @@ sqInt freedPIC; usqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result; if (!(methodZoneBase)) { @@ -9916,7 +9916,7 @@ CogMethod *cogMethod; usqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt mustScanAndUnlink; sqInt result; @@ -10015,7 +10015,7 @@ CogMethod *cogMethod; usqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result; if (!(methodZoneBase)) { @@ -10084,7 +10084,7 @@ sqInt freedPIC; usqInt map; sqInt mapByte; - sqInt mcpc; + usqInt mcpc; sqInt result; CogMethod *targetMethod; Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-04-29 13:58:43 UTC (rev 3689) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-04-30 17:58:20 UTC (rev 3690) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1851 uuid: a2b37448-8ea6-480e-aa07-e99d6de1744a + CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e from - CoInterpreter VMMaker.oscog-eem.1851 uuid: a2b37448-8ea6-480e-aa07-e99d6de1744a + CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1851 uuid: a2b37448-8ea6-480e-aa07-e99d6de1744a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1657,9 +1657,9 @@ _iss sqInt profileProcess; _iss sqInt numClassTablePages; _iss sqInt profileSemaphore; -_iss sqInt classTableIndex; _iss SpurNewSpaceSpace futureSpace; _iss sqInt profileMethod; +_iss sqInt classTableIndex; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt numRememberedEphemerons; _iss sqInt jmpDepth; @@ -2436,7 +2436,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1851"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-nice.1853"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6782,8 +6782,6 @@ objOop = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, classPointer, objOop); } superclass = objOop; - /* begin classTagForClass: */ - assert(addressCouldBeClassObj(superclass)); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(superclass)); GIV(lkupClassTag) = (((hash = (long32At(superclass + 4)) & (identityHashHalfWordMask()))) != 0 @@ -7905,7 +7903,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l464; + goto l463; } if (bytecode == 172) { @@ -7914,7 +7912,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l464; + goto l463; } if (bytecode > 167) { @@ -7924,7 +7922,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l464; + goto l463; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -7932,7 +7930,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l464: /* end case */; + l463: /* end case */; break; case 179: /* bytecodePrimGreaterThan */ @@ -8082,7 +8080,7 @@ localIP = (localIP + (bytecode - 151)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l465; + goto l464; } if (bytecode == 172) { @@ -8092,14 +8090,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l465; + goto l464; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l465: /* end case */; + l464: /* end case */; break; case 180: /* bytecodePrimLessOrEqual */ @@ -10255,7 +10253,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l466; + goto l465; } if (bytecode == 244) { @@ -10264,7 +10262,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l466; + goto l465; } if (bytecode == 243) { @@ -10274,7 +10272,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l466; + goto l465; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -10282,7 +10280,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l466: /* end case */; + l465: /* end case */; break; case 339: /*83*/ /* bytecodePrimGreaterThanV4 */ @@ -10432,7 +10430,7 @@ localIP = (localIP + (bytecode - 207)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l467; + goto l466; } if (bytecode == 244) { @@ -10442,14 +10440,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l467; + goto l466; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l467: /* end case */; + l466: /* end case */; break; case 340: /*84*/ /* bytecodePrimLessOrEqualV4 */ @@ -13007,12 +13005,12 @@ classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)fieldIndex) << (shiftForWord()))); if (classTablePage == GIV(nilObj)) { GIV(lkupClass) = null; - goto l468; + goto l467; } /* begin fetchPointer:ofObject: */ fieldIndex1 = GIV(lkupClassTag) & ((1LL << (classTableMajorIndexShift())) - 1); GIV(lkupClass) = longAt((classTablePage + BaseHeaderSize) + (((long)fieldIndex1) << (shiftForWord()))); - l468: /* end classAtIndex: */; + l467: /* end classAtIndex: */; /* begin lookupImplicitReceiverSend */ GIV(messageSelector) = (((GIV(messageSelector) & (tagMask())) == 0) && (((longAt(GIV(messageSelector))) & (classIndexMask())) == (isForwardedObjectClassIndexPun())) @@ -13077,12 +13075,12 @@ } GIV(newMethod) = objOop2; found = 1; - goto l473; + goto l472; } index += 1; } found = 0; - goto l473; + goto l472; } /* It is assumed that there are some nils in this dictionary, and search will @@ -13106,7 +13104,7 @@ nextSelector = longAt((dictionary + BaseHeaderSize) + (((long)index) << (shiftForWord()))); if (nextSelector == GIV(nilObj)) { found = 0; - goto l473; + goto l472; } if (((nextSelector & (tagMask())) == 0) && (((longAt(nextSelector)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { @@ -13128,24 +13126,24 @@ } GIV(newMethod) = objOop4; found = 1; - goto l473; + goto l472; } index += 1; if (index == length) { if (wrapAround) { found = 0; - goto l473; + goto l472; } wrapAround = 1; index = SelectorStart; } } found = 0; - l473: /* end lookupMethodInDictionary: */; + l472: /* end lookupMethodInDictionary: */; if (found) { GIV(localAbsentReceiver) = candidateReceiver; actualLookupRule = lookupLexicalfromrule(GIV(messageSelector), candidateMixin, LookupRuleImplicit); - goto l478; + goto l477; } /* begin followObjField:ofObject: */ objOop1 = longAt((candidateMixin + BaseHeaderSize) + (((long)EnclosingMixinIndex) << (shiftForWord()))); @@ -13166,7 +13164,7 @@ ? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (((long)tagBits1) << (shiftForWord()))) : fetchClassOfNonImm(methodReceiver)); actualLookupRule = lookupProtectedstartingAtrule(GIV(messageSelector), GIV(lkupClass), LookupRuleImplicit); - l478: /* end lookupImplicitReceiverSend */; + l477: /* end lookupImplicitReceiverSend */; /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -13194,26 +13192,26 @@ if (localPrimIndex >= 264) { /* begin internalStackTopPut: */ longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + (((long)(localPrimIndex - 264)) << (shiftForWord())))); - goto l469; + goto l468; } if (localPrimIndex == 256) { - goto l469; + goto l468; } if (localPrimIndex == 257) { longAtPointerput(localSP, GIV(trueObj)); - goto l469; + goto l468; } if (localPrimIndex == 258) { longAtPointerput(localSP, GIV(falseObj)); - goto l469; + goto l468; } if (localPrimIndex == 259) { longAtPointerput(localSP, GIV(nilObj)); - goto l469; + goto l468; } longAtPointerput(localSP, (((localPrimIndex - 261) << 3) | 1)); - l469: /* end internalQuickPrimitiveResponse */; - goto l470; + l468: /* end internalQuickPrimitiveResponse */; + goto l469; } /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -13275,7 +13273,7 @@ if (succeeded) { returntoExecutive(popStack(), 1); browserPluginReturnIfNeeded(); - goto l470; + goto l469; } } if (methodHasCogMethod(GIV(newMethod))) { @@ -13350,11 +13348,11 @@ table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)PrimErrTableIndex) << (shiftForWord()))); if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + (((long)(GIV(primFailCode) - 1)) << (shiftForWord()))); - goto l481; + goto l480; } } errorCode = ((GIV(primFailCode) << 3) | 1); - l481: /* end getErrorObjectFromPrimFailCode */; + l480: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(localSP, errorCode); } GIV(primFailCode) = 0; @@ -13378,7 +13376,7 @@ localFP = pointerForOop(GIV(framePointer)); } } - l470: /* end internalExecuteNewMethod */; + l469: /* end internalExecuteNewMethod */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -13458,7 +13456,7 @@ GIV(newMethod) = GIV(nsMethodCache)[probe1 + NSMethodCacheTargetMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(nsMethodCache)[probe1 + NSMethodCachePrimFunction])); GIV(localAbsentReceiverOrZero) = GIV(nsMethodCache)[probe1 + NSMethodCacheActualReceiver]; - goto l491; + goto l490; } /* second probe */ @@ -13470,7 +13468,7 @@ GIV(newMethod) = GIV(nsMethodCache)[probe1 + NSMethodCacheTargetMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(nsMethodCache)[probe1 + NSMethodCachePrimFunction])); GIV(localAbsentReceiverOrZero) = GIV(nsMethodCache)[probe1 + NSMethodCacheActualReceiver]; - goto l491; + goto l490; } probe1 = (((usqInt) hash1) >> 2) & NSMethodCacheMask; if (((((GIV(nsMethodCache)[probe1 + NSMethodCacheSelector]) == GIV(messageSelector)) @@ -13480,7 +13478,7 @@ GIV(newMethod) = GIV(nsMethodCache)[probe1 + NSMethodCacheTargetMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(nsMethodCache)[probe1 + NSMethodCachePrimFunction])); GIV(localAbsentReceiverOrZero) = GIV(nsMethodCache)[probe1 + NSMethodCacheActualReceiver]; - goto l491; + goto l490; } /* end inlineLookupInNSMethodCacheSel:classTag:method:lookupRule:; fall through */ /* begin externalizeIPandSP */ @@ -13507,12 +13505,12 @@ classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)fieldIndex) << (shiftForWord()))); if (classTablePage == GIV(nilObj)) { GIV(lkupClass) = null; - goto l485; + goto l484; } /* begin fetchPointer:ofObject: */ fieldIndex1 = GIV(lkupClassTag) & ((1LL << (classTableMajorIndexShift())) - 1); GIV(lkupClass) = longAt((classTablePage + BaseHeaderSize) + (((long)fieldIndex1) << (shiftForWord()))); - l485: /* end classAtIndex: */; + l484: /* end classAtIndex: */; /* begin lookupDynamicSuperSend */ GIV(localAbsentReceiver) = longAt(localFP + FoxIFReceiver); GIV(localAbsentReceiverOrZero) = 0; @@ -13534,7 +13532,7 @@ localSP = pointerForOop(GIV(stackPointer)); localFP = pointerForOop(GIV(framePointer)); addNewMethodToNSCache(actualLookupRule); - l491: ; + l490: ; /* begin shuffleArgumentsAndStoreAbsentReceiver: */ @@ -13556,26 +13554,26 @@ if (localPrimIndex >= 264) { /* begin internalStackTopPut: */ longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + (((long)(localPrimIndex - 264)) << (shiftForWord())))); - goto l486; + goto l485; } if (localPrimIndex == 256) { - goto l486; + goto l485; } if (localPrimIndex == 257) { longAtPointerput(localSP, GIV(trueObj)); - goto l486; + goto l485; } if (localPrimIndex == 258) { longAtPointerput(localSP, GIV(falseObj)); - goto l486; + goto l485; } if (localPrimIndex == 259) { longAtPointerput(localSP, GIV(nilObj)); - goto l486; + goto l485; } longAtPointerput(localSP, (((localPrimIndex - 261) << 3) | 1)); - l486: /* end internalQuickPrimitiveResponse */; - goto l487; + l485: /* end internalQuickPrimitiveResponse */; + goto l486; } /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -13637,7 +13635,7 @@ if (succeeded) { returntoExecutive(popStack(), 1); browserPluginReturnIfNeeded(); - goto l487; + goto l486; } } if (methodHasCogMethod(GIV(newMethod))) { @@ -13712,11 +13710,11 @@ table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)PrimErrTableIndex) << (shiftForWord()))); if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + (((long)(GIV(primFailCode) - 1)) << (shiftForWord()))); - goto l493; + goto l492; } } errorCode = ((GIV(primFailCode) << 3) | 1); - l493: /* end getErrorObjectFromPrimFailCode */; + l492: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(localSP, errorCode); } GIV(primFailCode) = 0; @@ -13740,7 +13738,7 @@ localFP = pointerForOop(GIV(framePointer)); } } - l487: /* end internalExecuteNewMethod */; + l486: /* end internalExecuteNewMethod */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -15212,7 +15210,7 @@ } /* drop low-order zeros from addresses (if classObj not classTag) */ - hash = GIV(messageSelector) ^ (classTagForClass(classObj)); + hash = GIV(messageSelector) ^ (ensureBehaviorHash(classObj)); if (((GIV(newMethod) & (tagMask())) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> (formatShift())) & (formatMask())) >= (firstCompiledMethodFormat()))) { /* begin primitiveIndexOfMethod:header: */ @@ -15250,7 +15248,7 @@ /* Found an empty entry -- use it */ GIV(methodCache)[probe + MethodCacheSelector] = GIV(messageSelector); - GIV(methodCache)[probe + MethodCacheClass] = (classTagForClass(classObj)); + GIV(methodCache)[probe + MethodCacheClass] = (ensureBehaviorHash(classObj)); GIV(methodCache)[probe + MethodCacheMethod] = GIV(newMethod); GIV(methodCache)[probe + MethodCachePrimFunction] = (((long) primitiveFunctionPointer)); @@ -15263,7 +15261,7 @@ /* first probe */ probe = hash & MethodCacheMask; GIV(methodCache)[probe + MethodCacheSelector] = GIV(messageSelector); - GIV(methodCache)[probe + MethodCacheClass] = (classTagForClass(classObj)); + GIV(methodCache)[probe + MethodCacheClass] = (ensureBehaviorHash(classObj)); GIV(methodCache)[probe + MethodCacheMethod] = GIV(newMethod); GIV(methodCache)[probe + MethodCachePrimFunction] = (((long) primitiveFunctionPointer)); @@ -17507,7 +17505,6 @@ objOop = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, classPointer, objOop); } classObj1 = objOop; - assert(addressCouldBeClassObj(classObj1)); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(classObj1)); classTag = (((hash = (long32At(classObj1 + 4)) & (identityHashHalfWordMask()))) != 0 @@ -17757,7 +17754,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt accessorDepth; + signed char accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -19354,7 +19351,7 @@ GIV(instructionPointer) = top; createActualMessageTo(classForMessage); GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)selectorIndex) << (shiftForWord()))); - if (lookupInMethodCacheSelclassTag(GIV(messageSelector), classTagForClass(GIV(lkupClass)))) { + if (lookupInMethodCacheSelclassTag(GIV(messageSelector), ensureBehaviorHash(GIV(lkupClass)))) { /* check for coggability because method is in the cache */ /* begin ifAppropriateCompileToNativeCode:selector: */ @@ -27090,7 +27087,7 @@ Bit 4 = method too big to be jitted (more than 64k of code, or needs more than 1.5Mb of stack space to compile) Bit 5 = method contains unknown/unjittable bytecode - Bit 7 = method should not be jitted because it contains a primitive not to + Bit 6 = method should not be jitted because it contains a primitive not to be called from machine code (unused) */ /* CoInterpreterPrimitives>>#primitiveMethodXray */ @@ -27121,10 +27118,10 @@ flags = 1 + 16; break; case EncounteredUnknownBytecode: - 1 + 32; + flags = 1 + 32; break; case ShouldNotJIT: - 1 + 64; + flags = 1 + 64; break; default: assert(!(((((((sqInt)cogMethod)) >= MaxNegativeErrorCode) && ((((sqInt)cogMethod)) <= NotFullyInitialized))))); @@ -37416,7 +37413,7 @@ if (!(((argumentArray & (tagMask())) == 0) && (((((usqInt) (longAt(argumentArray))) >> (formatShift())) & (formatMask())) == 2))) { GIV(primFailCode) = PrimErrBadArgument; - goto l8; + goto l7; } /* begin numSlotsOf: */ flag("endianness"); @@ -37427,7 +37424,7 @@ : numSlots); if (arraySize > (LargeContextSlots - CtxtTempFrameStart)) { GIV(primFailCode) = PrimErrBadNumArgs; - goto l8; + goto l7; } /* Push newMethod to save it in case of failure, @@ -37461,10 +37458,8 @@ ? (((tagBits1 = rcvr & (tagMask()))) != 0 ? tagBits1 : (longAt(rcvr)) & (classIndexMask())) - : (/* begin classTagForClass: */ + : (/* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(lookupClass)), - /* begin ensureBehaviorHash: */ - assert(addressCouldBeClassObj(lookupClass)), (((hash = (long32At(lookupClass + 4)) & (identityHashHalfWordMask()))) != 0 ? hash : (objCouldBeClassObj(lookupClass) @@ -37492,7 +37487,7 @@ GIV(stackPointer) += BytesPerWord; GIV(newMethod) = top; GIV(primFailCode) = PrimErrBadNumArgs; - goto l8; + goto l7; } /* +2 = receiver + saved newMethod */ @@ -37505,7 +37500,7 @@ executeNewMethod(); /* begin initPrimCall */ GIV(primFailCode) = 0; -l8: /* end primitiveObject:perform:withArguments:lookedUpIn: */; +l7: /* end primitiveObject:perform:withArguments:lookedUpIn: */; } /* InterpreterPrimitives>>#primitivePerformWithArgs */ @@ -37536,7 +37531,7 @@ if (!(((argumentArray & (tagMask())) == 0) && (((((usqInt) (longAt(argumentArray))) >> (formatShift())) & (formatMask())) == 2))) { GIV(primFailCode) = PrimErrBadArgument; - goto l7; + goto l6; } /* begin numSlotsOf: */ flag("endianness"); @@ -37547,7 +37542,7 @@ : numSlots); if (arraySize > (LargeContextSlots - CtxtTempFrameStart)) { GIV(primFailCode) = PrimErrBadNumArgs; - goto l7; + goto l6; } /* Push newMethod to save it in case of failure, @@ -37598,7 +37593,7 @@ GIV(stackPointer) += BytesPerWord; GIV(newMethod) = top; GIV(primFailCode) = PrimErrBadNumArgs; - goto l7; + goto l6; } /* +2 = receiver + saved newMethod */ @@ -37611,7 +37606,7 @@ executeNewMethod(); /* begin initPrimCall */ GIV(primFailCode) = 0; -l7: /* end primitiveObject:perform:withArguments:lookedUpIn: */; +l6: /* end primitiveObject:perform:withArguments:lookedUpIn: */; } @@ -43000,7 +42995,7 @@ sqInt fmt; usqInt instBytes; sqInt instFormat; - sqInt newFormat; + usqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -49038,7 +49033,6 @@ sqInt err; sqInt hash; - assert(addressCouldBeClassObj(classObj)); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(classObj)); return (((hash = (long32At(classObj + 4)) & (identityHashHalfWordMask()))) != 0 @@ -50546,6 +50540,7 @@ enterIntoClassTable(sqInt aBehavior) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classIndex; + sqInt hash; sqInt i; sqInt iLimiT; sqInt initialMajorIndex; @@ -50618,9 +50613,10 @@ } longAtput((page + BaseHeaderSize) + (((long)i) << (shiftForWord())), aBehavior); /* begin setHashBitsOf:to: */ + hash = GIV(classTableIndex); flag("endianness"); - assert(((GIV(classTableIndex) >= 0) && (GIV(classTableIndex) <= (identityHashHalfWordMask())))); - long32Atput(aBehavior + 4, ((((long32At(aBehavior + 4)) | (identityHashHalfWordMask())) - (identityHashHalfWordMask()))) + GIV(classTableIndex)); + assert(((hash >= 0) && (hash <= (identityHashHalfWordMask())))); + long32Atput(aBehavior + 4, ((((long32At(aBehavior + 4)) | (identityHashHalfWordMask())) - (identityHashHalfWordMask()))) + hash); assert((classAtIndex(rawHashBitsOf(aBehavior))) == aBehavior); return 0; } @@ -61370,7 +61366,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; Modified: branches/Cog/nsspur64src/vm/cointerp.h =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.h 2016-04-29 13:58:43 UTC (rev 3689) +++ branches/Cog/nsspur64src/vm/cointerp.h 2016-04-30 17:58:20 UTC (rev 3690) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1851 uuid: a2b37448-8ea6-480e-aa07-e99d6de1744a + CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e */ Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-04-29 13:58:43 UTC (rev 3689) +++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-04-30 17:58:20 UTC (rev 3690) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1851 uuid: a2b37448-8ea6-480e-aa07-e99d6de1744a + CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e from - CoInterpreter VMMaker.oscog-eem.1851 uuid: a2b37448-8ea6-480e-aa07-e99d6de1744a + CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1851 uuid: a2b37448-8ea6-480e-aa07-e99d6de1744a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1660,9 +1660,9 @@ _iss sqInt profileProcess; _iss sqInt numClassTablePages; _iss sqInt profileSemaphore; -_iss sqInt classTableIndex; _iss SpurNewSpaceSpace futureSpace; _iss sqInt profileMethod; +_iss sqInt classTableIndex; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt numRememberedEphemerons; _iss sqInt jmpDepth; @@ -2439,7 +2439,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1851"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-nice.1853"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6791,8 +6791,6 @@ objOop = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, classPointer, objOop); } superclass = objOop; - /* begin classTagForClass: */ - assert(addressCouldBeClassObj(superclass)); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(superclass)); GIV(lkupClassTag) = (((hash = (long32At(superclass + 4)) & (identityHashHalfWordMask()))) != 0 @@ -7914,7 +7912,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l464; + goto l463; } if (bytecode == 172) { @@ -7923,7 +7921,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l464; + goto l463; } if (bytecode > 167) { @@ -7933,7 +7931,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l464; + goto l463; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -7941,7 +7939,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l464: /* end case */; + l463: /* end case */; BREAK; CASE(179) /* bytecodePrimGreaterThan */ @@ -8091,7 +8089,7 @@ localIP = (localIP + (bytecode - 151)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l465; + goto l464; } if (bytecode == 172) { @@ -8101,14 +8099,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l465; + goto l464; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l465: /* end case */; + l464: /* end case */; BREAK; CASE(180) /* bytecodePrimLessOrEqual */ @@ -10264,7 +10262,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l466; + goto l465; } if (bytecode == 244) { @@ -10273,7 +10271,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l466; + goto l465; } if (bytecode == 243) { @@ -10283,7 +10281,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l466; + goto l465; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -10291,7 +10289,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l466: /* end case */; + l465: /* end case */; BREAK; CASE(339) /*83*/ /* bytecodePrimGreaterThanV4 */ @@ -10441,7 +10439,7 @@ localIP = (localIP + (bytecode - 207)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l467; + goto l466; } if (bytecode == 244) { @@ -10451,14 +10449,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l467; + goto l466; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l467: /* end case */; + l466: /* end case */; BREAK; CASE(340) /*84*/ /* bytecodePrimLessOrEqualV4 */ @@ -13016,12 +13014,12 @@ classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)fieldIndex) << (shiftForWord()))); if (classTablePage == GIV(nilObj)) { GIV(lkupClass) = null; - goto l468; + goto l467; } /* begin fetchPointer:ofObject: */ fieldIndex1 = GIV(lkupClassTag) & ((1LL << (classTableMajorIndexShift())) - 1); GIV(lkupClass) = longAt((classTablePage + BaseHeaderSize) + (((long)fieldIndex1) << (shiftForWord()))); - l468: /* end classAtIndex: */; + l467: /* end classAtIndex: */; /* begin lookupImplicitReceiverSend */ GIV(messageSelector) = (((GIV(messageSelector) & (tagMask())) == 0) && (((longAt(GIV(messageSelector))) & (classIndexMask())) == (isForwardedObjectClassIndexPun())) @@ -13086,12 +13084,12 @@ } GIV(newMethod) = objOop2; found = 1; - goto l473; + goto l472; } index += 1; } found = 0; - goto l473; + goto l472; } /* It is assumed that there are some nils in this dictionary, and search will @@ -13115,7 +13113,7 @@ nextSelector = longAt((dictionary + BaseHeaderSize) + (((long)index) << (shiftForWord()))); if (nextSelector == GIV(nilObj)) { found = 0; - goto l473; + goto l472; } if (((nextSelector & (tagMask())) == 0) && (((longAt(nextSelector)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { @@ -13137,24 +13135,24 @@ } GIV(newMethod) = objOop4; found = 1; - goto l473; + goto l472; } index += 1; if (index == length) { if (wrapAround) { found = 0; - goto l473; + goto l472; } wrapAround = 1; index = SelectorStart; } } found = 0; - l473: /* end lookupMethodInDictionary: */; + l472: /* end lookupMethodInDictionary: */; if (found) { GIV(localAbsentReceiver) = candidateReceiver; actualLookupRule = lookupLexicalfromrule(GIV(messageSelector), candidateMixin, LookupRuleImplicit); - goto l478; + goto l477; } /* begin followObjField:ofObject: */ objOop1 = longAt((candidateMixin + BaseHeaderSize) + (((long)EnclosingMixinIndex) << (shiftForWord()))); @@ -13175,7 +13173,7 @@ ? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (((long)tagBits1) << (shiftForWord()))) : fetchClassOfNonImm(methodReceiver)); actualLookupRule = lookupProtectedstartingAtrule(GIV(messageSelector), GIV(lkupClass), LookupRuleImplicit); - l478: /* end lookupImplicitReceiverSend */; + l477: /* end lookupImplicitReceiverSend */; /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -13203,26 +13201,26 @@ if (localPrimIndex >= 264) { /* begin internalStackTopPut: */ longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + (((long)(localPrimIndex - 264)) << (shiftForWord())))); - goto l469; + goto l468; } if (localPrimIndex == 256) { - goto l469; + goto l468; } if (localPrimIndex == 257) { longAtPointerput(localSP, GIV(trueObj)); - goto l469; + goto l468; } if (localPrimIndex == 258) { longAtPointerput(localSP, GIV(falseObj)); - goto l469; + goto l468; } if (localPrimIndex == 259) { longAtPointerput(localSP, GIV(nilObj)); - goto l469; + goto l468; } longAtPointerput(localSP, (((localPrimIndex - 261) << 3) | 1)); - l469: /* end internalQuickPrimitiveResponse */; - goto l470; + l468: /* end internalQuickPrimitiveResponse */; + goto l469; } /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -13284,7 +13282,7 @@ if (succeeded) { returntoExecutive(popStack(), 1); browserPluginReturnIfNeeded(); - goto l470; + goto l469; } } if (methodHasCogMethod(GIV(newMethod))) { @@ -13359,11 +13357,11 @@ table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)PrimErrTableIndex) << (shiftForWord()))); if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + (((long)(GIV(primFailCode) - 1)) << (shiftForWord()))); - goto l481; + goto l480; } } errorCode = ((GIV(primFailCode) << 3) | 1); - l481: /* end getErrorObjectFromPrimFailCode */; + l480: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(localSP, errorCode); } GIV(primFailCode) = 0; @@ -13387,7 +13385,7 @@ localFP = pointerForOop(GIV(framePointer)); } } - l470: /* end internalExecuteNewMethod */; + l469: /* end internalExecuteNewMethod */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -13467,7 +13465,7 @@ GIV(newMethod) = GIV(nsMethodCache)[probe1 + NSMethodCacheTargetMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(nsMethodCache)[probe1 + NSMethodCachePrimFunction])); GIV(localAbsentReceiverOrZero) = GIV(nsMethodCache)[probe1 + NSMethodCacheActualReceiver]; - goto l491; + goto l490; } /* second probe */ @@ -13479,7 +13477,7 @@ GIV(newMethod) = GIV(nsMethodCache)[probe1 + NSMethodCacheTargetMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(nsMethodCache)[probe1 + NSMethodCachePrimFunction])); GIV(localAbsentReceiverOrZero) = GIV(nsMethodCache)[probe1 + NSMethodCacheActualReceiver]; - goto l491; + goto l490; } probe1 = (((usqInt) hash1) >> 2) & NSMethodCacheMask; if (((((GIV(nsMethodCache)[probe1 + NSMethodCacheSelector]) == GIV(messageSelector)) @@ -13489,7 +13487,7 @@ GIV(newMethod) = GIV(nsMethodCache)[probe1 + NSMethodCacheTargetMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(nsMethodCache)[probe1 + NSMethodCachePrimFunction])); GIV(localAbsentReceiverOrZero) = GIV(nsMethodCache)[probe1 + NSMethodCacheActualReceiver]; - goto l491; + goto l490; } /* end inlineLookupInNSMethodCacheSel:classTag:method:lookupRule:; fall through */ /* begin externalizeIPandSP */ @@ -13516,12 +13514,12 @@ classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)fieldIndex) << (shiftForWord()))); if (classTablePage == GIV(nilObj)) { GIV(lkupClass) = null; - goto l485; + goto l484; } /* begin fetchPointer:ofObject: */ fieldIndex1 = GIV(lkupClassTag) & ((1LL << (classTableMajorIndexShift())) - 1); GIV(lkupClass) = longAt((classTablePage + BaseHeaderSize) + (((long)fieldIndex1) << (shiftForWord()))); - l485: /* end classAtIndex: */; + l484: /* end classAtIndex: */; /* begin lookupDynamicSuperSend */ GIV(localAbsentReceiver) = longAt(localFP + FoxIFReceiver); GIV(localAbsentReceiverOrZero) = 0; @@ -13543,7 +13541,7 @@ localSP = pointerForOop(GIV(stackPointer)); localFP = pointerForOop(GIV(framePointer)); addNewMethodToNSCache(actualLookupRule); - l491: ; + l490: ; /* begin shuffleArgumentsAndStoreAbsentReceiver: */ @@ -13565,26 +13563,26 @@ if (localPrimIndex >= 264) { /* begin internalStackTopPut: */ longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + (((long)(localPrimIndex - 264)) << (shiftForWord())))); - goto l486; + goto l485; } if (localPrimIndex == 256) { - goto l486; + goto l485; } if (localPrimIndex == 257) { longAtPointerput(localSP, GIV(trueObj)); - goto l486; + goto l485; } if (localPrimIndex == 258) { longAtPointerput(localSP, GIV(falseObj)); - goto l486; + goto l485; } if (localPrimIndex == 259) { longAtPointerput(localSP, GIV(nilObj)); - goto l486; + goto l485; } longAtPointerput(localSP, (((localPrimIndex - 261) << 3) | 1)); - l486: /* end internalQuickPrimitiveResponse */; - goto l487; + l485: /* end internalQuickPrimitiveResponse */; + goto l486; } /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -13646,7 +13644,7 @@ if (succeeded) { returntoExecutive(popStack(), 1); browserPluginReturnIfNeeded(); - goto l487; + goto l486; } } if (methodHasCogMethod(GIV(newMethod))) { @@ -13721,11 +13719,11 @@ table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)PrimErrTableIndex) << (shiftForWord()))); if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + (((long)(GIV(primFailCode) - 1)) << (shiftForWord()))); - goto l493; + goto l492; } } errorCode = ((GIV(primFailCode) << 3) | 1); - l493: /* end getErrorObjectFromPrimFailCode */; + l492: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(localSP, errorCode); } GIV(primFailCode) = 0; @@ -13749,7 +13747,7 @@ localFP = pointerForOop(GIV(framePointer)); } } - l487: /* end internalExecuteNewMethod */; + l486: /* end internalExecuteNewMethod */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -15221,7 +15219,7 @@ } /* drop low-order zeros from addresses (if classObj not classTag) */ - hash = GIV(messageSelector) ^ (classTagForClass(classObj)); + hash = GIV(messageSelector) ^ (ensureBehaviorHash(classObj)); if (((GIV(newMethod) & (tagMask())) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> (formatShift())) & (formatMask())) >= (firstCompiledMethodFormat()))) { /* begin primitiveIndexOfMethod:header: */ @@ -15259,7 +15257,7 @@ /* Found an empty entry -- use it */ GIV(methodCache)[probe + MethodCacheSelector] = GIV(messageSelector); - GIV(methodCache)[probe + MethodCacheClass] = (classTagForClass(classObj)); + GIV(methodCache)[probe + MethodCacheClass] = (ensureBehaviorHash(classObj)); GIV(methodCache)[probe + MethodCacheMethod] = GIV(newMethod); GIV(methodCache)[probe + MethodCachePrimFunction] = (((long) primitiveFunctionPointer)); @@ -15272,7 +15270,7 @@ /* first probe */ probe = hash & MethodCacheMask; GIV(methodCache)[probe + MethodCacheSelector] = GIV(messageSelector); - GIV(methodCache)[probe + MethodCacheClass] = (classTagForClass(classObj)); + GIV(methodCache)[probe + MethodCacheClass] = (ensureBehaviorHash(classObj)); GIV(methodCache)[probe + MethodCacheMethod] = GIV(newMethod); GIV(methodCache)[probe + MethodCachePrimFunction] = (((long) primitiveFunctionPointer)); @@ -17516,7 +17514,6 @@ objOop = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, classPointer, objOop); } classObj1 = objOop; - assert(addressCouldBeClassObj(classObj1)); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(classObj1)); classTag = (((hash = (long32At(classObj1 + 4)) & (identityHashHalfWordMask()))) != 0 @@ -17766,7 +17763,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt accessorDepth; + signed char accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -19363,7 +19360,7 @@ GIV(instructionPointer) = top; createActualMessageTo(classForMessage); GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)selectorIndex) << (shiftForWord()))); - if (lookupInMethodCacheSelclassTag(GIV(messageSelector), classTagForClass(GIV(lkupClass)))) { + if (lookupInMethodCacheSelclassTag(GIV(messageSelector), ensureBehaviorHash(GIV(lkupClass)))) { /* check for coggability because method is in the cache */ /* begin ifAppropriateCompileToNativeCode:selector: */ @@ -27099,7 +27096,7 @@ Bit 4 = method too big to be jitted (more than 64k of code, or needs more than 1.5Mb of stack space to compile) Bit 5 = method contains unknown/unjittable bytecode - Bit 7 = method should not be jitted because it contains a primitive not to + Bit 6 = method should not be jitted because it contains a primitive not to be called from machine code (unused) */ /* CoInterpreterPrimitives>>#primitiveMethodXray */ @@ -27130,10 +27127,10 @@ flags = 1 + 16; break; case EncounteredUnknownBytecode: - 1 + 32; + flags = 1 + 32; break; case ShouldNotJIT: - 1 + 64; + flags = 1 + 64; break; default: assert(!(((((((sqInt)cogMethod)) >= MaxNegativeErrorCode) && ((((sqInt)cogMethod)) <= NotFullyInitialized))))); @@ -37425,7 +37422,7 @@ if (!(((argumentArray & (tagMask())) == 0) && (((((usqInt) (longAt(argumentArray))) >> (formatShift())) & (formatMask())) == 2))) { GIV(primFailCode) = PrimErrBadArgument; - goto l8; + goto l7; } /* begin numSlotsOf: */ flag("endianness"); @@ -37436,7 +37433,7 @@ : numSlots); if (arraySize > (LargeContextSlots - CtxtTempFrameStart)) { GIV(primFailCode) = PrimErrBadNumArgs; - goto l8; + goto l7; } /* Push newMethod to save it in case of failure, @@ -37470,10 +37467,8 @@ ? (((tagBits1 = rcvr & (tagMask()))) != 0 ? tagBits1 : (longAt(rcvr)) & (classIndexMask())) - : (/* begin classTagForClass: */ + : (/* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(lookupClass)), - /* begin ensureBehaviorHash: */ - assert(addressCouldBeClassObj(lookupClass)), (((hash = (long32At(lookupClass + 4)) & (identityHashHalfWordMask()))) != 0 ? hash : (objCouldBeClassObj(lookupClass) @@ -37501,7 +37496,7 @@ GIV(stackPointer) += BytesPerWord; GIV(newMethod) = top; GIV(primFailCode) = PrimErrBadNumArgs; - goto l8; + goto l7; } /* +2 = receiver + saved newMethod */ @@ -37514,7 +37509,7 @@ executeNewMethod(); /* begin initPrimCall */ GIV(primFailCode) = 0; -l8: /* end primitiveObject:perform:withArguments:lookedUpIn: */; +l7: /* end primitiveObject:perform:withArguments:lookedUpIn: */; } /* InterpreterPrimitives>>#primitivePerformWithArgs */ @@ -37545,7 +37540,7 @@ if (!(((argumentArray & (tagMask())) == 0) && (((((usqInt) (longAt(argumentArray))) >> (formatShift())) & (formatMask())) == 2))) { GIV(primFailCode) = PrimErrBadArgument; - goto l7; + goto l6; } /* begin numSlotsOf: */ flag("endianness"); @@ -37556,7 +37551,7 @@ : numSlots); if (arraySize > (LargeContextSlots - CtxtTempFrameStart)) { GIV(primFailCode) = PrimErrBadNumArgs; - goto l7; + goto l6; } /* Push newMethod to save it in case of failure, @@ -37607,7 +37602,7 @@ GIV(stackPointer) += BytesPerWord; GIV(newMethod) = top; GIV(primFailCode) = PrimErrBadNumArgs; - goto l7; + goto l6; } /* +2 = receiver + saved newMethod */ @@ -37620,7 +37615,7 @@ executeNewMethod(); /* begin initPrimCall */ GIV(primFailCode) = 0; -l7: /* end primitiveObject:perform:withArguments:lookedUpIn: */; +l6: /* end primitiveObject:perform:withArguments:lookedUpIn: */; } @@ -43009,7 +43004,7 @@ sqInt fmt; usqInt instBytes; sqInt instFormat; - sqInt newFormat; + usqInt newFormat; sqInt normalizedInstFormat; usqInt numBytes; usqInt numSlots; @@ -49047,7 +49042,6 @@ sqInt err; sqInt hash; - assert(addressCouldBeClassObj(classObj)); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(classObj)); return (((hash = (long32At(classObj + 4)) & (identityHashHalfWordMask()))) != 0 @@ -50555,6 +50549,7 @@ enterIntoClassTable(sqInt aBehavior) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classIndex; + sqInt hash; sqInt i; sqInt iLimiT; sqInt initialMajorIndex; @@ -50627,9 +50622,10 @@ } longAtput((page + BaseHeaderSize) + (((long)i) << (shiftForWord())), aBehavior); /* begin setHashBitsOf:to: */ + hash = GIV(classTableIndex); flag("endianness"); - assert(((GIV(classTableIndex) >= 0) && (GIV(classTableIndex) <= (identityHashHalfWordMask())))); - long32Atput(aBehavior + 4, ((((long32At(aBehavior + 4)) | (identityHashHalfWordMask())) - (identityHashHalfWordMask()))) + GIV(classTableIndex)); + assert(((hash >= 0) && (hash <= (identityHashHalfWordMask())))); + long32Atput(aBehavior + 4, ((((long32At(aBehavior + 4)) | (identityHashHalfWordMask())) - (identityHashHalfWordMask()))) + hash); assert((classAtIndex(rawHashBitsOf(aBehavior))) == aBehavior); return 0; } @@ -61379,7 +61375,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2016-04-29 13:58:43 UTC (rev 3689) +++ branches/Cog/nsspursrc/vm/cogit.h 2016-04-30 17:58:20 UTC (rev 3690) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1851 uuid: a2b37448-8ea6-480e-aa07-e99d6de1744a + CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-04-29 13:58:43 UTC (rev 3689) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-04-30 17:58:20 UTC (rev 3690) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1851 uuid: a2b37448-8ea6-480e-aa07-e99d6de1744a + CCodeGenerator VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e from - StackToRegisterMappingCogit VMMaker.oscog-eem.1851 uuid: a2b37448-8ea6-480e-aa07-e99d6de1744a + StackToRegisterMappingCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e */ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: Cog-eem.317.mcz
by commits＠source.squeak.org 30 Apr '16

30 Apr '16

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.317.mcz ==================== Summary ==================== Name: Cog-eem.317 Author: eem Time: 30 April 2016, 10:53:05.924588 am UUID: 421df5c5-c733-442e-9a19-0db0e78025d9 Ancestors: Cog-eem.316 Eliminate ARM-specific code from abstract disassembler ,ethodf overridden in ARM subclass. =============== Diff against Cog-eem.316 =============== Item was changed: ----- Method: CogProcessorAlien>>disassembleFrom:to:in:for:labels:on: (in category 'disassembly') ----- disassembleFrom: startAddress to: endAddress in: memory for: aSymbolManager "<Cogit>" labels: labelDictionary on: aStream | address | address := startAddress. [address <= endAddress] whileTrue: + [[:sizeArg :stringArg| | size string | + size := sizeArg. + string := stringArg. + (aSymbolManager labelForPC: address) ifNotNil: - [[:sizeArg :stringArg| | size string index offset | - size := sizeArg. - string := stringArg. - (aSymbolManager labelForPC: address) ifNotNil: [:label| aStream nextPutAll: label; nextPut: $:; cr]. + (labelDictionary at: address ifAbsent: []) ifNotNil: - (labelDictionary at: address ifAbsent: []) ifNotNil: [:label| label isArray ifTrue: [label first == #literal ifTrue: [aStream nextPutAll: (address printStringBase: 16 length: 8 padded: true) asLowercase; nextPut: $:; space; nextPutAll: (aSymbolManager lookupAddress: (aSymbolManager objectMemory longAt: address))] ifFalse: [aStream nextPutAll: label first; nextPut: $:; cr; nextPutAll: (address printStringBase: 16 length: 8 padded: true) asLowercase; nextPut: $:; space; nextPutAll: (aSymbolManager perform: label second with: address) asString]. string := nil. size := label third] ifFalse: [aStream nextPutAll: label; nextPut: $:; cr]]. + string ifNotNil: + [aStream nextPutAll: (self decorateDisassembly: string for: aSymbolManager fromAddress: address)]. + aStream cr; flush. + address := address + size] - string ifNotNil: - [aStream nextPutAll: (self decorateDisassembly: string for: aSymbolManager fromAddress: address). - ((string includesSubString: ': ldr ') - and: [(index := string indexOfSubCollection: ' [pc, #' startingAt: 1) > 0]) ifTrue: - [offset := Integer readFrom: (ReadStream on: string from: index + 6 to: string size). - offset := address + 8 + offset. - labelDictionary - at: offset - ifAbsentPut: []]]. - aStream cr; flush. - address := address + size] valueWithArguments: (self primitiveDisassembleAt: address inMemory: memory)]!

1 0

Fwd: [Cuis-dev] [Vm-dev] Cuis now runs with latest Cog, but I don't understand the problem we had
by Nicolas Cellier 29 Apr '16

29 Apr '16

---------- Forwarded message ---------- From: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-04-29 23:01 GMT+02:00 Subject: Re: [Cuis-dev] [Vm-dev] Cuis now runs with latest Cog, but I don't understand the problem we had To: Juan Vuletich <JuanVuletich(a)zoho.com> 2016-04-28 22:24 GMT+02:00 Nicolas Cellier < nicolas.cellier.aka.nice(a)gmail.com>: > I can reproduce the problem with same snippet on a Squeak 4.6 image with > squeak.cog.v3. > The snippet works well with squeak.stack.v3. > > 2016-04-28 21:46 GMT+02:00 Juan Vuletich <JuanVuletich(a)zoho.com>: > >> On 4/28/2016 4:39 PM, Nicolas Cellier via Cuis-dev wrote: >> >> Moreover, as long as you write primitive: 110 in cog, you don't invoke >> primitive 110. >> You rather invoke genPrimitiveIdentical. >> Please try the snippet on a StackVM. >> >> >> Sure. Can you provide a link to such VM? It should be based on >> VMMaker.oscog-eem.1370/r3386 or later, as the problem doesn't happen with >> any Cog older than that. >> >> Thanks, >> Juan Vuletich >> >> genPrimitiveIdentical has been slightly refactored, but I see no obvious >> problem by just reading code. >> >> Bah, case of mud in the eyes? I now clearly see the problem: the compare instruction has disappeared from latest version of genPrimitiveIdenticalOrNotIf: If you can compile a VM, the problem should be fixed, else just wait for next Eliot delivery. > Moreover, when you use Object = you'll also call same methods in the end... >> This would deserve experimenting VMSimulator... (I don't have the Bochs >> plugin working now) >> >> 2016-04-28 21:21 GMT+02:00 Nicolas Cellier < >> nicolas.cellier.aka.nice(a)gmail.com>: >> >>> Hi Juan, then how do you explain: >>> >>> "Just to clarify: the issue was experienced only when running on Cog... >>> current versions of the Stack VM performed as expected." >>> >>> >>> 2016-04-28 21:10 GMT+02:00 Juan Vuletich <JuanVuletich(a)zoho.com>: >>> >>>> >>>> On 4/28/2016 2:13 PM, Phil (list) wrote: >>>> >>>>> >>>>> On Thu, 2016-04-28 at 12:58 -0400, Phil (list) wrote: >>>>> >>>>>> On Thu, 2016-04-28 at 16:43 +0200, Clément Bera wrote: >>>>>> >>>>>>> Have you tried on latest VM ? I remembered fixing a bug on #== >>>>>>> primitive like a month ago. The problem was when performing #== >>>>>>> primitive with the argument being a forwarder to an immediate. >>>>>>> >>>>>>> The problem still existed as of Cog #3686 (Juan found the fix >>>>>> yesterday.) On my system, Cuis last worked perfectly with 3370, >>>>>> mostly >>>>>> worked with 3390, somewhat worked with 3427 and did not work after >>>>>> that >>>>>> until we found the Character>>#= bug/fix. >>>>>> >>>>> Just to clarify: the issue was experienced only when running on Cog... >>>>> current versions of the Stack VM performed as expected. >>>>> >>>> >>>> Fortunately I work with Gera Richarte @ Satellogic, and it didn't take >>>> long for him to suggest an explanation: Maybe prim 110 is broken in recent >>>> Cog VMs, but nobody notices it because the only sender is #== that is >>>> already optimized by the jitter, so prim 110 is never really called. And I >>>> realized we can test that theory. First, we add this method to Character: >>>> >>>> === aCharacter >>>> <primitive: 110> >>>> self halt >>>> >>>> Then the following snippet (in latest Cuis, #2744): >>>> >>>> 0 to: 255 do: [ :i1 | 0 to: 255 do: [ :i2 | i1 = i2 ifFalse: >>>> [(Character value: i1) === (Character value: i2) ifTrue: [{i1.i2} print ]]]] >>>> >>>> prints nothing if run with Cog 3370, but prints a lot of pairs in more >>>> recent Cog. So I think Gera is right. >>>> >>>> Thanks, >>>> Juan Vuletich >>>> >>>> >>> >> >> _______________________________________________ >> Cuis-dev mailing listCuis-dev@cuis-smalltalk.orghttp://cuis-smalltalk.org/mailman/listinfo/cuis-dev_cuis-smalltalk.org >> >> >> >

1 0

VM Maker: VMMaker.oscog-nice.1853.mcz
by commits＠source.squeak.org 29 Apr '16

29 Apr '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1853.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1853 Author: nice Time: 29 April 2016, 10:58:38.094 pm UUID: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e Ancestors: VMMaker.oscog-nice.1852 Fix missing comparison operation in genPrimitiveIdentical. This should fix Character = problem encounterd in Cuis. Comment concretizePrefetchAw, and store machineCode in last statement so as to avoid a -Wunused-value warning. =============== Diff against VMMaker.oscog-nice.1852 =============== Item was changed: ----- Method: CogIA32Compiler>>concretizePrefetchAw (in category 'generate machine code') ----- concretizePrefetchAw "Will get inlined into concretizeAt: switch." <inline: true> | addressOperand | + "Note that maxSize has been set to 7 or 0 in computeMaximumSize whether hasSSEInstructions or not" - machineCodeSize := maxSize. maxSize > 0 ifTrue: [addressOperand := operands at: 0. machineCode at: 0 put: 16r0f; at: 1 put: 16r18; at: 2 put: (self mod: 0 RM: 5 RO: 1); "prefetch0, prefetch using the T0 temporal data hint" at: 3 put: (addressOperand bitAnd: 16rFF); at: 4 put: (addressOperand >> 8 bitAnd: 16rFF); at: 5 put: (addressOperand >> 16 bitAnd: 16rFF); at: 6 put: (addressOperand >> 24 bitAnd: 16rFF)]. + ^machineCodeSize := maxSize! - ^maxSize! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>genPrimitiveIdenticalOrNotIf: (in category 'primitive generators') ----- genPrimitiveIdenticalOrNotIf: orNot | jumpCmp | <var: #jumpCmp type: #'AbstractInstruction *'> cogit genLoadArgAtDepth: 0 into: Arg0Reg. + cogit CmpR: Arg0Reg R: ReceiverResultReg. jumpCmp := orNot ifTrue: [cogit JumpZero: 0] ifFalse: [cogit JumpNonZero: 0]. cogit genMoveTrueR: ReceiverResultReg. cogit genPrimReturn. jumpCmp jmpTarget: (cogit genMoveFalseR: ReceiverResultReg). cogit genPrimReturn. ^UnfailingPrimitive!

1 0

Small doubt in B2DPlugin
by Nicolas Cellier 29 Apr '16

29 Apr '16

Hi, in stepToFirstWideBezierIn: bezier at: yValue I see this; xDir := ((self bezierUpdateDataOf: bezier) at: GBUpdateDX). xDir = 0 ifTrue:[((self bezierUpdateDataOf: bezier) at: GBUpdateDDX)]. xDir >= 0 ifTrue:[xDir := 1] ifFalse:[xDir := -1]. I wonder if the intention of 2nd line is not xDir = 0 ifTrue:[xDir := ((self bezierUpdateDataOf: bezier) at: GBUpdateDDX)]. because otherwise the statement has no effect (it would warn -Wunused-value)

1 0

PrefetchAW
by Nicolas Cellier 29 Apr '16

29 Apr '16

Hi Eliot, I'm not sure I understand assembler at all, but: - byte order sounds strange in X64 concretizePrefetchAw >> (0, 16, 8 , 24) - why is machineCodeSize 7 in X64 but maxSize in IA32?

1 1

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2016