Vm-dev January 2013

vm-dev@lists.squeakfoundation.org

27 participants
148 discussions

VM Maker: VMMaker.oscog-eem.244.mcz
by commits＠source.squeak.org 02 Jan '13

02 Jan '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.244.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.244 Author: eem Time: 2 January 2013, 12:03:44.839 pm UUID: c9625bb4-bc55-4b75-942c-084c12ea9648 Ancestors: VMMaker.oscog-eem.243 Restore Cogit wanting COGMTVM to be determined on command line. Probably broke in VMMaker.oscog-eem.218 =============== Diff against VMMaker.oscog-eem.243 =============== Item was changed: ----- Method: Cogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator #( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation' 'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass' 'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses' 'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters' 'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep') do: [:simulationVariableNotNeededForRealVM| aCCodeGenerator removeVariable: simulationVariableNotNeededForRealVM]. NewspeakVM ifFalse: [#( 'dynSuperEntry' 'dynSuperEntryAlignment' 'dynamicSuperSendTrampolines' 'ceImplicitReceiverTrampoline' 'ceExplicitReceiverTrampoline' 'cmDynSuperEntryOffset') do: [:variableNotNeededInNormalVM| aCCodeGenerator removeVariable: variableNotNeededInNormalVM]]. + aCCodeGenerator removeConstant: #COGMTVM. "this should be defined at compile time" aCCodeGenerator addHeaderFile:'<stddef.h>'; "for e.g. offsetof" addHeaderFile:'"sqCogStackAlignment.h"'; addHeaderFile:'"cogmethod.h"'; addHeaderFile:'#if COGMTVM'; addHeaderFile:'"cointerpmt.h"'; addHeaderFile:'#else'; addHeaderFile:'"cointerp.h"'; addHeaderFile:'#endif'; addHeaderFile:'"cogit.h"'; addHeaderFile:'"dispdbg.h"'. aCCodeGenerator var: #ceGetSP declareC: 'unsigned long (*ceGetSP)(void)'; var: #ceCaptureCStackPointers declareC: 'void (*ceCaptureCStackPointers)(void)'; var: #ceEnterCogCodePopReceiverReg declareC: 'void (*ceEnterCogCodePopReceiverReg)(void)'; var: #realCEEnterCogCodePopReceiverReg declareC: 'void (*realCEEnterCogCodePopReceiverReg)(void)'; var: #ceEnterCogCodePopReceiverAndClassRegs declareC: 'void (*ceEnterCogCodePopReceiverAndClassRegs)(void)'; var: #realCEEnterCogCodePopReceiverAndClassRegs declareC: 'void (*realCEEnterCogCodePopReceiverAndClassRegs)(void)'; var: #ceFlushICache declareC: 'static void (*ceFlushICache)(unsigned long from, unsigned long to)'; var: #ceCheckFeaturesFunction declareC: 'static unsigned long (*ceCheckFeaturesFunction)(void)'; var: #ceTryLockVMOwner declareC: 'unsigned long (*ceTryLockVMOwner)(void)'; var: #ceUnlockVMOwner declareC: 'void (*ceUnlockVMOwner)(void)'; var: #postCompileHook declareC: 'void (*postCompileHook)(CogMethod *, void *)'; var: #openPICList declareC: 'CogMethod *openPICList = 0'; var: #maxMethodBefore type: #'CogBlockMethod *'. aCCodeGenerator declareVar: 'aMethodLabel' type: #'AbstractInstruction'; "Has to come lexicographically before backEnd & methodLabel" var: #backEnd declareC: 'AbstractInstruction * const backEnd = &aMethodLabel'; var: #methodLabel declareC: 'AbstractInstruction * const methodLabel = &aMethodLabel'; var: #primInvokeLabel type: #'AbstractInstruction *'. self declareC: #(abstractOpcodes stackCheckLabel blockEntryLabel blockEntryNoContextSwitch stackOverflowCall sendMissCall entry noCheckEntry dynSuperEntry mnuCall interpretCall endCPICCase0 endCPICCase1) as: #'AbstractInstruction *' in: aCCodeGenerator. aCCodeGenerator declareVar: #annotations type: #'InstructionAnnotation *'; declareVar: #blockStarts type: #'BlockStart *'; declareVar: #fixups type: #'BytecodeFixup *'. aCCodeGenerator var: #sendTrampolines declareC: 'sqInt sendTrampolines[NumSendTrampolines]'; var: #superSendTrampolines declareC: 'sqInt superSendTrampolines[NumSendTrampolines]'; var: #dynamicSuperSendTrampolines declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]'; var: #trampolineAddresses declareC: 'static char *trampolineAddresses[NumTrampolines*2]'; var: #objectReferencesInRuntime declareC: 'static sqInt objectReferencesInRuntime[NumObjRefsInRuntime]'; var: #cePositive32BitIntegerTrampoline declareC: 'static sqInt cePositive32BitIntegerTrampoline'; var: #labelCounter declareC: 'static int labelCounter'; var: #traceFlags declareC: 'int traceFlags = 8 /* prim trace log on by default */'; var: #cStackAlignment declareC: 'const int cStackAlignment = STACK_ALIGN_BYTES'. aCCodeGenerator declareVar: #CFramePointer type: #'void *'; declareVar: #CStackPointer type: #'void *'; declareVar: #minValidCallAddress type: #'unsigned long'; declareVar: #debugPrimCallStackOffset type: #'unsigned long'. aCCodeGenerator var: #generatorTable declareC: 'BytecodeDescriptor generatorTable[', aCCodeGenerator vmClass generatorTable size, ']' , (self tableInitializerFor: aCCodeGenerator vmClass generatorTable in: aCCodeGenerator); var: #primitiveGeneratorTable declareC: 'PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1]' , (self tableInitializerFor: aCCodeGenerator vmClass primitiveTable in: aCCodeGenerator). "In C the abstract opcode names clash with the Smalltak generator syntactic sugar. Most of the syntactic sugar is inlined, but alas some remains. Rename the syntactic sugar to avoid the clash." (self organization listAtCategoryNamed: #'abstract instructions') do: [:s| aCCodeGenerator addSelectorTranslation: s to: 'g', (aCCodeGenerator cFunctionNameFor: s)]. aCCodeGenerator addSelectorTranslation: #halt: to: 'haltmsg'!

1 0

[commit][2648] CogVM source as per VMMaker.oscog-eem.244.
by commits＠squeakvm.org 02 Jan '13

02 Jan '13

Revision: 2648 Author: eliot Date: 2013-01-02 12:05:38 -0800 (Wed, 02 Jan 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.244. Restore Cogit wanting COGMTVM to be determined on command line. Probably broke in VMMaker.oscog-eem.218. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-01-02 19:49:06 UTC (rev 2647) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-01-02 20:05:38 UTC (rev 2648) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGenerator * VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jan 2 11:44:47 PST 2013 + Wed Jan 2 12:04:45 PST 2013

1 0

[commit][2647] CogVM source as per VMMaker.oscog-eem.243.
by commits＠squeakvm.org 02 Jan '13

02 Jan '13

Revision: 2647 Author: eliot Date: 2013-01-02 11:49:06 -0800 (Wed, 02 Jan 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.243. Integrate issue 112. Add ULL suffix to > 32 bit integer literals. May help fix large integer arithmetic on 64-bit values with dumb C compilers. Integrate issue 115. Fix FFIPlugin/ThreadedFFIPlugin unsignedShortAt:. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.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/exampleSqNamedPrims.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 Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 from - CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1928,7 +1928,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.241"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.243"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -29264,7 +29264,7 @@ /* Protect against overflow */ - if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -30162,7 +30162,7 @@ /* This is to avoid undue (usqInt) cast */ - result = 18446744073709551615UL; + result = 18446744073709551615ULL; if ((shift >= 64) || (a > (result >> shift))) { /* begin primitiveFail */ @@ -38136,7 +38136,7 @@ } if ((a > 1) && ((b > 1) - && (a > (18446744073709551615UL / b)))) { + && (a > (18446744073709551615ULL / b)))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -41799,7 +41799,7 @@ /* Protect against overflow */ - if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ Modified: branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h =================================================================== --- branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* This is an automatically generated table of all builtin modules in the VM - CoInterpreterPrimitives VMMaker.oscog-eem.233 + CoInterpreterPrimitives VMMaker.oscog-eem.243 */ extern sqExport vm_exports[]; Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-02 19:49:06 UTC (rev 2647) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 from - CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1931,7 +1931,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.241"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.243"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -29273,7 +29273,7 @@ /* Protect against overflow */ - if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -30171,7 +30171,7 @@ /* This is to avoid undue (usqInt) cast */ - result = 18446744073709551615UL; + result = 18446744073709551615ULL; if ((shift >= 64) || (a > (result >> shift))) { /* begin primitiveFail */ @@ -38145,7 +38145,7 @@ } if ((a > 1) && ((b > 1) - && (a > (18446744073709551615UL / b)))) { + && (a > (18446744073709551615ULL / b)))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -41808,7 +41808,7 @@ /* Protect against overflow */ - if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/nscogsrc/vm/interp.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Dec 20 16:44:39 PST 2012 + Wed Jan 2 11:44:47 PST 2013 Modified: branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c =================================================================== --- branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f + VMPluginCodeGenerator VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 from - ThreadedIA32FFIPlugin VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f + ThreadedIA32FFIPlugin VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ -static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f " __DATE__ ; +static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; @@ -419,9 +419,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SqueakFFIPrims VMMaker.oscog-eem.238 (i)" + "SqueakFFIPrims VMMaker.oscog-eem.243 (i)" #else - "SqueakFFIPrims VMMaker.oscog-eem.238 (e)" + "SqueakFFIPrims VMMaker.oscog-eem.243 (e)" #endif ; @@ -5053,7 +5053,7 @@ value = byteAt(addr); } else { - value = *((short int *) addr); + value = *((unsigned short int *) addr); } if (isSigned) { Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/cointerp.c 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 from - CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1918,7 +1918,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.241]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.243]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -24812,7 +24812,7 @@ /* Protect against overflow */ - if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -25710,7 +25710,7 @@ /* This is to avoid undue (usqInt) cast */ - result = 18446744073709551615UL; + result = 18446744073709551615ULL; if ((shift >= 64) || (a > (result >> shift))) { /* begin primitiveFail */ @@ -33637,7 +33637,7 @@ } if ((a > 1) && ((b > 1) - && (a > (18446744073709551615UL / b)))) { + && (a > (18446744073709551615ULL / b)))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -37290,7 +37290,7 @@ /* Protect against overflow */ - if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/cointerp.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/cointerpmt.c 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 from - CoInterpreterMT VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CoInterpreterMT VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2017,7 +2017,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.241]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.243]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -26050,7 +26050,7 @@ /* Protect against overflow */ - if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -26948,7 +26948,7 @@ /* This is to avoid undue (usqInt) cast */ - result = 18446744073709551615UL; + result = 18446744073709551615ULL; if ((shift >= 64) || (a > (result >> shift))) { /* begin primitiveFail */ @@ -34875,7 +34875,7 @@ } if ((a > 1) && ((b > 1) - && (a > (18446744073709551615UL / b)))) { + && (a > (18446744073709551615ULL / b)))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -38621,7 +38621,7 @@ /* Protect against overflow */ - if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/cointerpmt.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ Modified: branches/Cog/src/vm/exampleSqNamedPrims.h =================================================================== --- branches/Cog/src/vm/exampleSqNamedPrims.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/exampleSqNamedPrims.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* This is an automatically generated table of all builtin modules in the VM - CoInterpreterPrimitives VMMaker.oscog-eem.233 + CoInterpreterMT VMMaker.oscog-eem.243 */ extern sqExport vm_exports[]; Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-01-02 19:49:06 UTC (rev 2647) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 from - CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1921,7 +1921,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.241]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.243]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -24821,7 +24821,7 @@ /* Protect against overflow */ - if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -25719,7 +25719,7 @@ /* This is to avoid undue (usqInt) cast */ - result = 18446744073709551615UL; + result = 18446744073709551615ULL; if ((shift >= 64) || (a > (result >> shift))) { /* begin primitiveFail */ @@ -33646,7 +33646,7 @@ } if ((a > 1) && ((b > 1) - && (a > (18446744073709551615UL / b)))) { + && (a > (18446744073709551615ULL / b)))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -37299,7 +37299,7 @@ /* Protect against overflow */ - if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-01-02 19:49:06 UTC (rev 2647) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 from - CoInterpreterMT VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CoInterpreterMT VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2020,7 +2020,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.241]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.243]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -26059,7 +26059,7 @@ /* Protect against overflow */ - if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -26957,7 +26957,7 @@ /* This is to avoid undue (usqInt) cast */ - result = 18446744073709551615UL; + result = 18446744073709551615ULL; if ((shift >= 64) || (a > (result >> shift))) { /* begin primitiveFail */ @@ -34884,7 +34884,7 @@ } if ((a > 1) && ((b > 1) - && (a > (18446744073709551615UL / b)))) { + && (a > (18446744073709551615ULL / b)))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -38630,7 +38630,7 @@ /* Protect against overflow */ - if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/interp.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/vmCallback.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.243.mcz
by commits＠source.squeak.org 02 Jan '13

02 Jan '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.243.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.243 Author: eem Time: 2 January 2013, 11:34:09.193 am UUID: 72a4a123-e10e-4d32-90dd-0b74014f02d3 Ancestors: VMMaker.oscog-eem.242 Integrate issue 112. Add ULL suffix to > 32 bit integer literals. Add a test for integer literal generation (doesn't yet test negative values). =============== Diff against VMMaker.oscog-eem.242 =============== Item was changed: ----- Method: CCodeGenerator>>cLiteralFor: (in category 'C code generator') ----- cLiteralFor: anObject "Return a string representing the C literal value for the given object." anObject isNumber ifTrue: [anObject isInteger ifTrue: + [^anObject > 16rFFFFFFFF + ifTrue: [anObject printString , ObjectMemory unsignedLongLongSuffix] + ifFalse: [anObject < 16r7FFFFFFF + ifTrue: [anObject printString] + ifFalse: [anObject printString , ObjectMemory unsignedIntegerSuffix]]]. - [^(anObject < 16r7FFFFFFF) - ifTrue: [anObject printString] - ifFalse: [anObject printString , ObjectMemory unsignedIntegerSuffix]]. anObject isFloat ifTrue: [^anObject printString]] ifFalse: [anObject isSymbol ifTrue: [^self cFunctionNameFor: anObject]. anObject isString ifTrue: [^'"', (anObject copyReplaceAll: (String with: Character cr) with: '\n') , '"']. anObject == nil ifTrue: [^ 'null' ]. anObject == true ifTrue: [^ '1' ]. anObject == false ifTrue: [^ '0' ]. anObject isCharacter ifTrue: [^anObject == $' ifTrue: ['''\'''''] "i.e. '\''" ifFalse: [anObject asString printString]]]. self error: 'Warning: A Smalltalk literal could not be translated into a C constant: ', anObject printString. ^'"XXX UNTRANSLATABLE CONSTANT XXX"'! Item was changed: ----- Method: CCodeGenerator>>cLiteralFor:name: (in category 'C code generator') ----- cLiteralFor: anObject name: smalltalkName "Return a string representing the C literal value for the given object. This version may use hex for integers that are bit masks." anObject isInteger ifTrue: [| hex dec rep | hex := anObject printStringBase: 16. dec := anObject printStringBase: 10. rep := ((smalltalkName endsWith: 'Mask') or: [anObject digitLength > 1 and: [(hex asSet size * 3) <= (dec asSet size * 2) and: [(smalltalkName endsWith: 'Size') not]]]) ifTrue: [hex first = $- ifTrue: ['-0x', hex allButFirst] ifFalse: ['0x', hex]] ifFalse: [dec]. + ^anObject > 16rFFFFFFFF + ifTrue: [rep, ObjectMemory unsignedLongLongSuffix] + ifFalse: [anObject < 16r7FFFFFFF + ifTrue: [rep] + ifFalse: [rep, ObjectMemory unsignedIntegerSuffix]]]. - ^(anObject < 16r7FFFFFFF) - ifTrue: [rep] - ifFalse: [rep, ObjectMemory unsignedIntegerSuffix "ikp"]]. ^self cLiteralFor: anObject! Item was added: + TestCase subclass: #CCodeGeneratorTests + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Tests'! Item was added: + ----- Method: CCodeGeneratorTests>>cg (in category 'private') ----- + cg + ^CCodeGenerator new! Item was added: + ----- Method: CCodeGeneratorTests>>testIntegerGeneration (in category 'tests') ----- + testIntegerGeneration + + "Test the 32-bit integers. They need to be marked as unsigned longs. + Test 16rFFFFFFFF, 16rFFFFFFFE, ... through to ..., 16rC0000000, 16r80000000" + ((0 to: 31) collect: [:shift| 16rFFFFFFFF bitClear: (1 bitShift: shift) - 1]) do: + [:number| | literal | + literal := self cg cLiteralFor: number. + self assert: ((literal allButLast: 2) allSatisfy: [:c| c isDigit]). + self assert: (literal endsWith: 'UL'). + + literal := self cg cLiteralFor: number name: 'Mask'. + self assert: (literal beginsWith: '0x'). + self assert: (((literal allButFirst: 2) allButLast: 2) allSatisfy: [:c| '0123456789CEF' includes: c]). + self assert: (literal endsWith: 'UL')]. + + "Test the 64-bit integers. They need to be marked as unsigned long longs." + ((32 to: 64) collect: [:shift| 16rFFFFFFFFFFFFFFFF bitClear: (1 bitShift: shift) - 1]) do: + [:number| | literal | + literal := self cg cLiteralFor: number. + self assert: ((literal allButLast: 3) allSatisfy: [:c| c isDigit]). + self assert: (literal endsWith: 'ULL'). + + literal := self cg cLiteralFor: number name: 'Mask'. + self assert: (literal beginsWith: '0x'). + self assert: (((literal allButFirst: 2) allButLast: 3) allSatisfy: [:c| '0123456789CEF' includes: c]). + self assert: (literal endsWith: 'ULL')]! Item was added: + ----- Method: ObjectMemory class>>unsignedLongLongSuffix (in category 'translation') ----- + unsignedLongLongSuffix + "Answer the suffix that should be appended to unsigned integer literals in generated code." + + ^'ULL'!

1 0

VM Maker: VMMaker.oscog-eem.242.mcz
by commits＠source.squeak.org 02 Jan '13

02 Jan '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.242.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.242 Author: eem Time: 2 January 2013, 10:34:42.111 am UUID: 239a00e7-4aed-4e7b-b564-0088b6af5dd0 Ancestors: VMMaker.oscog-eem.241 Cog issue 115. Fix FFIPlugin/ThreadedFFIPlugin unsignedShortAt: =============== Diff against VMMaker.oscog-eem.241 =============== Item was changed: ----- Method: FFIPlugin>>primitiveFFIIntegerAt (in category 'primitives') ----- primitiveFFIIntegerAt "Return a (signed or unsigned) n byte integer from the given byte offset." | isSigned byteSize byteOffset rcvr addr value mask | <export: true> <inline: false> isSigned := interpreterProxy booleanValueOf: (interpreterProxy stackValue: 0). byteSize := interpreterProxy stackIntegerValue: 1. byteOffset := interpreterProxy stackIntegerValue: 2. rcvr := interpreterProxy stackObjectValue: 3. interpreterProxy failed ifTrue:[^0]. (byteOffset > 0 and:[byteSize = 1 or:[byteSize = 2 or:[byteSize = 4]]]) ifFalse:[^interpreterProxy primitiveFail]. addr := self ffiAddressOf: rcvr startingAt: byteOffset size: byteSize. interpreterProxy failed ifTrue:[^0]. byteSize < 4 ifTrue:[ "short/byte" byteSize = 1 ifTrue:[value := interpreterProxy byteAt: addr] + ifFalse:[ value := self cCode: '*((unsigned short int *) addr)' - ifFalse:[ value := self cCode: '*((short int *) addr)' inSmalltalk: [interpreterProxy shortAt: addr]]. isSigned ifTrue:["sign extend value" mask := 1 << (byteSize * 8 - 1). value := (value bitAnd: mask-1) - (value bitAnd: mask)]. "note: byte/short never exceed SmallInteger range" value := interpreterProxy integerObjectOf: value. ] ifFalse:[ "general 32 bit integer" value := interpreterProxy longAt: addr. isSigned ifTrue:[value := interpreterProxy signed32BitIntegerFor: value] ifFalse:[value := interpreterProxy positive32BitIntegerFor: value]. ]. interpreterProxy pop: 4. ^interpreterProxy push: value ! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveFFIIntegerAt (in category 'primitives') ----- primitiveFFIIntegerAt "Return a (signed or unsigned) n byte integer from the given byte offset." | isSigned byteSize byteOffset rcvr addr value mask | <export: true> <inline: false> isSigned := interpreterProxy booleanValueOf: (interpreterProxy stackValue: 0). byteSize := interpreterProxy stackIntegerValue: 1. byteOffset := interpreterProxy stackIntegerValue: 2. rcvr := interpreterProxy stackObjectValue: 3. interpreterProxy failed ifTrue:[^0]. (byteOffset > 0 and:[byteSize = 1 or:[byteSize = 2 or:[byteSize = 4]]]) ifFalse:[^interpreterProxy primitiveFail]. addr := self ffiAddressOf: rcvr startingAt: byteOffset size: byteSize. interpreterProxy failed ifTrue:[^0]. byteSize < 4 ifTrue:[ "short/byte" byteSize = 1 ifTrue:[value := interpreterProxy byteAt: addr] + ifFalse:[ value := self cCode: '*((unsigned short int *) addr)' - ifFalse:[ value := self cCode: '*((short int *) addr)' inSmalltalk: [interpreterProxy shortAt: addr]]. isSigned ifTrue:["sign extend value" mask := 1 << (byteSize * 8 - 1). value := (value bitAnd: mask-1) - (value bitAnd: mask)]. "note: byte/short never exceed SmallInteger range" value := interpreterProxy integerObjectOf: value. ] ifFalse:[ "general 32 bit integer" value := interpreterProxy longAt: addr. value := isSigned ifTrue:[interpreterProxy signed32BitIntegerFor: value] ifFalse:[interpreterProxy positive32BitIntegerFor: value]. ]. interpreterProxy pop: 4 thenPush: value!

1 0

[commit][2646] setting file types
by commits＠squeakvm.org 02 Jan '13

02 Jan '13

Revision: 2646 Author: rowledge Date: 2013-01-01 15:46:54 -0800 (Tue, 01 Jan 2013) Log Message: ----------- setting file types Property Changed: ---------------- trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/HALTimer trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/MillisecondTimer Property changes on: trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/HALTimer ___________________________________________________________________ Modified: svn:riscosfiletype - FFA + ffa Property changes on: trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/MillisecondTimer ___________________________________________________________________ Modified: svn:riscosfiletype - FFA + ffa

1 0

[commit][2645] colourtrans_CURRENT_MODE is now os_CURRENT_MODE
by commits＠squeakvm.org 02 Jan '13

02 Jan '13

Revision: 2645 Author: rowledge Date: 2013-01-01 15:16:28 -0800 (Tue, 01 Jan 2013) Log Message: ----------- colourtrans_CURRENT_MODE is now os_CURRENT_MODE Modified Paths: -------------- trunk/platforms/RiscOS/vm/sqRPCWindows.c Modified: trunk/platforms/RiscOS/vm/sqRPCWindows.c =================================================================== --- trunk/platforms/RiscOS/vm/sqRPCWindows.c 2012-12-31 19:16:16 UTC (rev 2644) +++ trunk/platforms/RiscOS/vm/sqRPCWindows.c 2013-01-01 23:16:28 UTC (rev 2645) @@ -7,7 +7,7 @@ /* Window & OS interface stuff */ /**************************************************************************/ -/* To recompile this reliably you will need */ +/* To recompile this reliably you will need */ /* OSLib - http://ro-oslib.sourceforge.net/ */ /* Castle/AcornC/C++, the Acorn TCPIPLib */ /* and a little luck */ @@ -195,7 +195,7 @@ * prim and fail it cleanly. * Initialize the block to a sensible state */ -static int nextIndex = 1; +static int nextIndex = 1; windowDescriptorBlock *thisWindow; thisWindow = (windowDescriptorBlock*) calloc(1, sizeof(windowDescriptorBlock)); if ( thisWindow == NULL) { @@ -437,7 +437,7 @@ #ifdef DEBUG stopTime = microsecondsvalue(); PRINTF(("\\t DisplayReverseArea @ %d for w:%d h:%d took: %d\n", startTime, x1 - x0, y1 - y0, stopTime - startTime)); -#endif +#endif return; } @@ -461,7 +461,7 @@ } more = wimp_redraw_window( wblock ); while ( more ) { - PRINTF(("\\t display pixmap l:%d t:%d r:%d b:%d\n", wblock->box.x0, wblock->box.y1, wblock->box.x1, wblock->box.y0)); + PRINTF(("\\t display pixmap l:%d t:%d r:%d b:%d\n", wblock->box.x0, wblock->box.y1, wblock->box.x1, wblock->box.y0)); if ((e = xosspriteop_put_sprite_scaled ( osspriteop_PTR, spriteAreaPtr, @@ -524,19 +524,19 @@ /* window status */ - + void ResizeWindow(windowDescriptorBlock * thisWindow) { wimp_drag dragBlock; PRINTF(("\\t ResizeWindow %x\n", (int)thisWindow->handle)); dragBlock.w = thisWindow->handle; dragBlock.type = wimp_DRAG_SYSTEM_SIZE; dragBlock.initial.x0 = thisWindow->visibleArea.x0; - dragBlock.initial.y0 = thisWindow->visibleArea.y0; + dragBlock.initial.y0 = thisWindow->visibleArea.y0; dragBlock.initial.x1 = thisWindow->visibleArea.x1; - dragBlock.initial.y1 = thisWindow->visibleArea.y1; + dragBlock.initial.y1 = thisWindow->visibleArea.y1; wimp_drag_box(&dragBlock); /* when the drag is finished a window open_Request is sent, - * and WindowOpen called to reset the cached size etc */ + * and WindowOpen called to reset the cached size etc */ return; } @@ -563,7 +563,7 @@ /* set the root window title string. * if the -windowlabel: option was used, the title is the * string given; limited to the last WindowTitleLength (150) chars. - */ + */ extern char * windowLabel; char * string; if ( windowLabel == NULL) { @@ -589,9 +589,9 @@ } /* set size of window */ wblock.visible.x0 = thisWindow->visibleArea.x0; - wblock.visible.y0 = thisWindow->visibleArea.y0; - wblock.visible.x1 = thisWindow->visibleArea.x1; - wblock.visible.y1 = thisWindow->visibleArea.y1; + wblock.visible.y0 = thisWindow->visibleArea.y0; + wblock.visible.x1 = thisWindow->visibleArea.x1; + wblock.visible.y1 = thisWindow->visibleArea.y1; /* insist on 0 scroll offsets */ wblock.xscroll = 0; wblock.yscroll = 0; @@ -641,7 +641,7 @@ /* plenty big enough for even 32bpp, but is not awkwardly big */ thisWindow->pixelTranslationTable = realloc( thisWindow->pixelTranslationTable, 1024); for( i = 0; i<256; i++) { - xcolourtrans_return_colour_number_for_mode((os_colour)(paletteTable.entries[i]), colourtrans_CURRENT_MODE, (os_palette*)colourtrans_CURRENT_PALETTE, &val); + xcolourtrans_return_colour_number_for_mode((os_colour)(paletteTable.entries[i]), os_CURRENT_MODE, (os_palette*)colourtrans_CURRENT_PALETTE, &val); if ( screenBitPerPixel <= 8) { thisWindow->pixelTranslationTable->c[i] = (byte)(val & 0xFF); } else { @@ -665,7 +665,7 @@ } else { currPal = (log2bpp > 3) ? colourtrans_CURRENT_PALETTE : (os_palette*)&paletteTable; /* call colourTrans_generate_table to find out how big the tx table has to be */ - if ( (e = xcolourtrans_generate_table( thisWindow->displaySprite->mode, currPal, colourtrans_CURRENT_MODE, colourtrans_CURRENT_PALETTE, NULL, colourtrans_RETURN_WIDE_ENTRIES, NULL, NULL, &tableSize )) != NULL) { + if ( (e = xcolourtrans_generate_table( thisWindow->displaySprite->mode, currPal, os_CURRENT_MODE, colourtrans_CURRENT_PALETTE, NULL, colourtrans_RETURN_WIDE_ENTRIES, NULL, NULL, &tableSize )) != NULL) { platReportFatalError(e); return ; } @@ -674,7 +674,7 @@ thisWindow->pixelTranslationTable = realloc( thisWindow->pixelTranslationTable, tableSize); PRINTF(("ok %0x s: %d\n", (int)thisWindow->pixelTranslationTable, tableSize)); /* call colourTrans_generate_table to build the tx table */ - if ( (e = xcolourtrans_generate_table( thisWindow->displaySprite->mode, currPal, colourtrans_CURRENT_MODE, colourtrans_CURRENT_PALETTE, thisWindow->pixelTranslationTable, colourtrans_RETURN_WIDE_ENTRIES, NULL, NULL, &tableSize )) != NULL) { + if ( (e = xcolourtrans_generate_table( thisWindow->displaySprite->mode, currPal, os_CURRENT_MODE, colourtrans_CURRENT_PALETTE, thisWindow->pixelTranslationTable, colourtrans_RETURN_WIDE_ENTRIES, NULL, NULL, &tableSize )) != NULL) { platReportFatalError(e); return ; } @@ -815,7 +815,7 @@ return false; } /* setup the sprite area . Start it at the beginning of the allocated chunk */ - spriteAreaPtr = (osspriteop_area *)(ptr); + spriteAreaPtr = (osspriteop_area *)(ptr); spriteAreaPtr->size = neededSize; spriteAreaPtr->sprite_count = 1; spriteAreaPtr->first = 16; @@ -841,7 +841,7 @@ } else { /* make the sprite name be SqW0001 etc */ sprintf(thisWindow->spriteName, "SqW%08d", thisWindow->windowIndex); - } + } /* derive the sprite mode from the depth(d) requested */ #define SPR_MODE_WORD(arg) ((arg<<osspriteop_TYPE_SHIFT) | (180<<osspriteop_YRES_SHIFT) | (180<<osspriteop_XRES_SHIFT) | 1 ) switch (thisWindow->squeakDisplayDepth) { @@ -878,7 +878,7 @@ sprintf(thisWindow->spriteName, "\0"); thisWindow->displaySprite = null; PRINTF(("DeleteSpr2: pTT %0x\n", thisWindow->pixelTranslationTable)); - UpdateDisplaySpritePtrs(); + UpdateDisplaySpritePtrs(); } void InitRootWindow(void) { @@ -886,7 +886,7 @@ * code can run ok. Set the pointer to hostWindow[1] and make sure its * handle is null */ - rootWindow = AddWindowBlock(); + rootWindow = AddWindowBlock(); PRINTF(("\\t initRootWindow: &%x, %d\n", (int)rootWindow, (int)rootWindow->handle)); } @@ -899,7 +899,7 @@ RemoveWindowBlock(thisWindow); xwimp_close_window(thisWindow->handle); - + } void BuildWindow(windowDescriptorBlock * thisWindow) { @@ -936,7 +936,7 @@ wblock.flags = wimp_WINDOW_NEW_FORMAT | wimp_WINDOW_MOVEABLE | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT - | thisWindow->attributes; + | thisWindow->attributes; /* colours */ wblock.title_fg = wimp_COLOUR_BLACK; wblock.title_bg = wimp_COLOUR_LIGHT_GREY; @@ -951,7 +951,7 @@ wblock.extent.x1 = screenSizeP.x<<scalingFactor.x; wblock.extent.y1 = 0; /* titlebar flags */ - wblock.title_flags = wimp_ICON_TEXT + wblock.title_flags = wimp_ICON_TEXT | wimp_ICON_FILLED | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_BORDER | wimp_ICON_INDIRECTED; /* work area flags */ @@ -989,7 +989,7 @@ os_coord originP, sizeP; wimp_window_info wblock; /* set the size of the root window. - * don't make it bigger than the screen size and centre it + * don't make it bigger than the screen size and centre it */ /* maximum size is screen size */ @@ -1004,7 +1004,7 @@ thisWindow->visibleArea.x1 = Pix2OSX(originP.x + sizeP.x); thisWindow->visibleArea.y1 = Pix2OSY(originP.y + sizeP.y); - thisWindow->attributes = + thisWindow->attributes = wimp_WINDOW_TITLE_ICON| wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_BACK_ICON; @@ -1014,7 +1014,7 @@ } void CreatePlainWindow(windowDescriptorBlock * thisWindow) { /* Create a plain window. The visibleArea values MUST be setup before this - * can be called, as well as the windowIndex + * can be called, as well as the windowIndex */ PRINTF(("\\t Create plain window %d\n", thisWindow->windowIndex)); thisWindow->title[0] = '\0'; @@ -1043,7 +1043,7 @@ * requested width@height but the bitmap MUST be * that size or we will have great fun trying to do * the reversal echoing. - */ + */ PRINTF(("\\t CreateDisplayBitmap i: %d p:%x w: %d h:%d d:%d\n", thisWindow->windowIndex, (int)thisWindow->handle, width, height, depth)); /* create the RiscOS pixmap to the right dimensions */ @@ -1076,7 +1076,7 @@ return false; } PRINTF(("\\t extend sprite area to size: %d, used: %d\n", spriteAreaPtr->size, spriteAreaPtr->used)); - } + } /* build the actual sprite and translation table */ CreateSprite(thisWindow); @@ -1107,7 +1107,7 @@ thisWindow->attributes = 0; if (attributeListLength == 4) { /* if the attribute list is 4 bytes we treat it as an int - * otherwise we ignore it */ + * otherwise we ignore it */ thisWindow->attributes = *(int*)attributeList; } return thisWindow->windowIndex; @@ -1139,7 +1139,7 @@ } /* ioShowDisplayOnWindow: similar to ioShowDisplay but adds the int windowIndex - * Return true if ok, false if not, but not currently checked + * Return true if ok, false if not, but not currently checked * BitBlt has messed with part of the Display/Window - inform the WIMP so * that it gets redrawn when we do HandleEvents and get a * wimp_REDRAW_WINDOW_REQUEST */ @@ -1151,7 +1151,7 @@ affectedR = MIN(affectedR, width); affectedT = MAX(affectedT, 0); affectedB = MIN(affectedB, height); - + if(affectedR <= affectedL || affectedT >= affectedB) return true; PRINTF(("\\t ioShowDisplayOnWindow: %d @ %d l:%d t:%d r:%d b:%d\n", windowIndex, microsecondsvalue(), affectedL, affectedT, affectedR, affectedB)); @@ -1165,7 +1165,7 @@ * build a window to suit. That can be dropped someday when * Display is not a special case. */ - + if( thisWindow->displaySprite == NULL || thisWindow->bitmapExtentP.x != width || thisWindow->bitmapExtentP.y != height || @@ -1211,7 +1211,7 @@ return -1; } if (windowIndex == 1 && thisWindow->handle == null) { - /* main window not yet open, derive from saved size in image + /* main window not yet open, derive from saved size in image if there's no window yet, we need to check the screen metrics to make sure we don't make too big a window later */ @@ -1257,7 +1257,7 @@ /* x0 stays as currently set */ /* y0 is y1 - h<<scale */ thisWindow->visibleArea.y0 = thisWindow->visibleArea.y1 - - Pix2OSY(height); + - Pix2OSY(height); /* y1 stays as is */ /* x1 is x0 + w<<scale */ thisWindow->visibleArea.x1 = thisWindow->visibleArea.x0 @@ -1346,7 +1346,7 @@ if ((thisWindow->attributes | wimp_WINDOW_TITLE_ICON) == 0 ) { return -1; } - + /* copy to the window */ strncpy(thisWindow->title, newTitle, sizeOfTitle); thisWindow->title[sizeOfTitle] = '\0'; @@ -1389,7 +1389,7 @@ if it is 1 as well, set 'black' */ if(maskWord & (1<<(j))) { line |= (1<< ((15-j)<<1)); - if(cursorWord & (1<<(j))) + if(cursorWord & (1<<(j))) line |= (2<< ((15-j)<<1)); } } @@ -1463,7 +1463,7 @@ thisWindow->visibleArea.y1 = Pix2OSY(screenSizeP.y) - thisWindow->visibleArea.y0; thisWindow->visibleArea.y0 = 0; SetWindowBounds(thisWindow); - } + } /* save the new size in case the image is saved */ setSavedWindowSize( (OS2PixX(thisWindow->visibleArea.x1 - thisWindow->visibleArea.x0) << 16) @@ -1498,8 +1498,8 @@ * Fail if we can't meet the request 'reasonably'. */ -// not viable for multiple windows and not decently specified anyway -static os_box prevSize = {0,0,0,0}; +// not viable for multiple windows and not decently specified anyway +static os_box prevSize = {0,0,0,0}; if (fullScreenFlag) { /* find out if we can do a screen mode change to requested size. * fail if not. @@ -1548,7 +1548,7 @@ } sqInt ioHasDisplayDepth(sqInt bitsPerPixel) { -// return true for all supported bpp supported. +// return true for all supported bpp supported. switch((int)bitsPerPixel) { // -ve numbers invoke a littleendian display - doesn't quite work for // some reason.

1 0

Cog + CI = win!
by Frank Shearar 01 Jan '13

01 Jan '13

http://squeakci.org/job/SqueakTrunkOnBleedingEdgeCog/3/console shows what happens when one can piggyback on David Lewis' hard work: that's the output you get running Squeak's full test suite on a bleeding-edge Cog VM. frank

1 0

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 January 2013