Vm-dev January 2013

vm-dev@lists.squeakfoundation.org

27 participants
148 discussions

Compiling Cog on FreeBSD
by Frank Shearar 31 Jan '13

31 Jan '13

First, thanks Eliot for fixing up the UUID plugin. With that fixed, the next error I get when compiling (32 bit) on FreeBSD is this: sqUnixMemory.c /usr/home/jenkins/workspace/CogVM-FreeBSD/target/Squeak-vm-unix-4.6.0-Cog-2664-unofficial-src/platforms/unix/vm/sqUnixMemory.c: In function 'sqMakeMemoryExecutableFromTo': /usr/home/jenkins/workspace/CogVM-FreeBSD/target/Squeak-vm-unix-4.6.0-Cog-2664-unofficial-src/platforms/unix/vm/sqUnixMemory.c:298: error: 'pageMask' undeclared (first use in this function) The line number looks a bit wrong, because pageMask is in a #define on line 293. (Ah, it's because line 298 uses the #define.) At any rate, the relevant function + context looks like this: #if COGVM # define roundDownToPageBoundary(v) ((v)&pageMask) # define roundUpToPageBoundary(v) (((v)+pageSize-1)&pageMask) void sqMakeMemoryExecutableFromTo(unsigned long startAddr, unsigned long endAddr) { unsigned long firstPage = roundDownToPageBoundary(startAddr); if (mprotect((void *)firstPage, endAddr - firstPage + 1, PROT_READ | PROT_WRITE | PROT_EXEC) < 0) perror("mprotect(x,y,PROT_READ | PROT_WRITE | PROT_EXEC)"); } void sqMakeMemoryNotExecutableFromTo(unsigned long startAddr, unsigned long endAddr) { unsigned long firstPage = roundDownToPageBoundary(startAddr); if (mprotect((void *)firstPage, endAddr - firstPage + 1, PROT_READ | PROT_WRITE) < 0) perror("mprotect(x,y,PROT_READ | PROT_WRITE)"); } #endif /* COGVM */ A bit confusing, given that pageMask is declared on line 100, as whatever C calls a top level form. A global? What can I do to make things work? The full ouput's viewable here: http://squeakci.org/job/CogVM-FreeBSD/13/console frank

2 11

new Cog VMs available
by Eliot Miranda 31 Jan '13

31 Jan '13

...at http://www.mirandabanda.org/files/Cog/VM/VM.r2677/. CogVM binaries as per VMMaker.oscog-eem.261/r2677. Move determination of the ammount of headroom to the platform in osCogStackPageHeadroom (in the various sqFooMain.c files). Hence 2k stack pages on Mac and Win32 with 4k pages on linux. Provide a routine to monitor the ammount of unused headroom, which requires the stack memory be zeroed before use. Assume the platform will provide a -reportheadroom flag for enabling the report. Provide primitiveMinimumUnusedHeadroom for in-image access. -- best, Eliot

1 0

[commit][2677] Back out of the addition of the named serial port read & write primitives to
by commits＠squeakvm.org 31 Jan '13

31 Jan '13

Revision: 2677 Author: eliot Date: 2013-01-31 10:00:18 -0800 (Thu, 31 Jan 2013) Log Message: ----------- Back out of the addition of the named serial port read & write primitives to the SerialPlugin. They're lacking adequate platform support right now. Modified Paths: -------------- branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jan 30 17:41:13 PST 2013 + Thu Jan 31 09:58:48 PST 2013 Modified: branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c =================================================================== --- branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c 2013-01-31 01:42:03 UTC (rev 2676) +++ branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c 2013-01-31 18:00:18 UTC (rev 2677) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - SerialPlugin VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 + SerialPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "SerialPlugin VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 " __DATE__ ; +static char __buildInfo[] = "SerialPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -49,11 +49,8 @@ static sqInt msg(char *s); EXPORT(sqInt) primitiveSerialPortClose(void); EXPORT(sqInt) primitiveSerialPortOpen(void); -EXPORT(sqInt) primitiveSerialPortOpenByName(void); EXPORT(sqInt) primitiveSerialPortRead(void); -EXPORT(sqInt) primitiveSerialPortReadByName(void); EXPORT(sqInt) primitiveSerialPortWrite(void); -EXPORT(sqInt) primitiveSerialPortWriteByName(void); EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); EXPORT(sqInt) shutdownModule(void); static void sqAssert(sqInt aBool); @@ -69,7 +66,6 @@ static sqInt (*isBytes)(sqInt oop); static sqInt (*pop)(sqInt nItems); static sqInt (*popthenPush)(sqInt nItems, sqInt oop); -static sqInt (*slotSizeOf)(sqInt oop); static sqInt (*stackIntegerValue)(sqInt offset); static sqInt (*stackValue)(sqInt offset); static sqInt (*success)(sqInt aBoolean); @@ -81,7 +77,6 @@ extern sqInt isBytes(sqInt oop); extern sqInt pop(sqInt nItems); extern sqInt popthenPush(sqInt nItems, sqInt oop); -extern sqInt slotSizeOf(sqInt oop); extern sqInt stackIntegerValue(sqInt offset); extern sqInt stackValue(sqInt offset); extern sqInt success(sqInt aBoolean); @@ -91,9 +86,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SerialPlugin VMMaker.oscog-eem.261 (i)" + "SerialPlugin VMMaker.oscog-eem.235 (i)" #else - "SerialPlugin VMMaker.oscog-eem.261 (e)" + "SerialPlugin VMMaker.oscog-eem.235 (e)" #endif ; @@ -192,48 +187,6 @@ } EXPORT(sqInt) -primitiveSerialPortOpenByName(void) -{ - sqInt baudRate; - sqInt dataBits; - sqInt inFlowControl; - sqInt outFlowControl; - sqInt parityType; - char *port; - char *portName; - sqInt portNameSize; - sqInt stopBitsType; - sqInt xOffChar; - sqInt xOnChar; - - success(isBytes(stackValue(8))); - portName = ((char *) (firstIndexableField(stackValue(8)))); - baudRate = stackIntegerValue(7); - stopBitsType = stackIntegerValue(6); - parityType = stackIntegerValue(5); - dataBits = stackIntegerValue(4); - inFlowControl = stackIntegerValue(3); - outFlowControl = stackIntegerValue(2); - xOnChar = stackIntegerValue(1); - xOffChar = stackIntegerValue(0); - if (failed()) { - return null; - } - portNameSize = slotSizeOf(((int) portName) - 4); - port = calloc(portNameSize, sizeof(char)); - memcpy(port, portName, portNameSize); - serialPortOpenByName( - port, baudRate, stopBitsType, parityType, dataBits, - inFlowControl, outFlowControl, xOnChar, xOffChar); - free(port); - if (failed()) { - return null; - } - pop(9); - return null; -} - -EXPORT(sqInt) primitiveSerialPortRead(void) { char *array; @@ -265,44 +218,6 @@ } EXPORT(sqInt) -primitiveSerialPortReadByName(void) -{ - char *array; - sqInt arrayPtr; - sqInt bytesRead; - sqInt count; - char *port; - char *portName; - sqInt portNameSize; - sqInt startIndex; - sqInt _return_value; - - success(isBytes(stackValue(3))); - portName = ((char *) (firstIndexableField(stackValue(3)))); - success(isBytes(stackValue(2))); - array = ((char *) (firstIndexableField(stackValue(2)))); - startIndex = stackIntegerValue(1); - count = stackIntegerValue(0); - if (failed()) { - return null; - } - success((startIndex >= 1) - && (((startIndex + count) - 1) <= (byteSizeOf(((sqInt)(long)(array) - 4))))); - portNameSize = slotSizeOf(((int) portName) - 4); - port = calloc(portNameSize, sizeof(char)); - memcpy(port, portName, portNameSize); - arrayPtr = ((((sqInt)array)) + startIndex) - 1; - bytesRead = serialPortReadIntoByName( port, count, arrayPtr); - free(port); - _return_value = integerObjectOf(bytesRead); - if (failed()) { - return null; - } - popthenPush(5, _return_value); - return null; -} - -EXPORT(sqInt) primitiveSerialPortWrite(void) { char *array; @@ -335,47 +250,7 @@ return null; } -EXPORT(sqInt) -primitiveSerialPortWriteByName(void) -{ - char *array; - sqInt arrayPtr; - sqInt bytesWritten; - sqInt count; - char *port; - char *portName; - sqInt portNameSize; - sqInt startIndex; - sqInt _return_value; - success(isBytes(stackValue(3))); - portName = ((char *) (firstIndexableField(stackValue(3)))); - success(isBytes(stackValue(2))); - array = ((char *) (firstIndexableField(stackValue(2)))); - startIndex = stackIntegerValue(1); - count = stackIntegerValue(0); - if (failed()) { - return null; - } - portNameSize = slotSizeOf(((int) portName) - 4); - port = calloc(portNameSize, sizeof(char)); - memcpy(port, portName, portNameSize); - success((startIndex >= 1) - && (((startIndex + count) - 1) <= (byteSizeOf(((sqInt)(long)(array) - 4))))); - if (!(failed())) { - arrayPtr = ((((sqInt)array)) + startIndex) - 1; - bytesWritten = serialPortWriteFromByName(port, count, arrayPtr); - } - free(port); - _return_value = integerObjectOf(bytesWritten); - if (failed()) { - return null; - } - popthenPush(5, _return_value); - return null; -} - - /* Note: This is coded so that it can be run in Squeak. */ EXPORT(sqInt) @@ -396,7 +271,6 @@ isBytes = interpreterProxy->isBytes; pop = interpreterProxy->pop; popthenPush = interpreterProxy->popthenPush; - slotSizeOf = interpreterProxy->slotSizeOf; stackIntegerValue = interpreterProxy->stackIntegerValue; stackValue = interpreterProxy->stackValue; success = interpreterProxy->success; @@ -425,11 +299,8 @@ {"SerialPlugin", "initialiseModule", (void*)initialiseModule}, {"SerialPlugin", "primitiveSerialPortClose", (void*)primitiveSerialPortClose}, {"SerialPlugin", "primitiveSerialPortOpen", (void*)primitiveSerialPortOpen}, - {"SerialPlugin", "primitiveSerialPortOpenByName", (void*)primitiveSerialPortOpenByName}, {"SerialPlugin", "primitiveSerialPortRead", (void*)primitiveSerialPortRead}, - {"SerialPlugin", "primitiveSerialPortReadByName", (void*)primitiveSerialPortReadByName}, {"SerialPlugin", "primitiveSerialPortWrite", (void*)primitiveSerialPortWrite}, - {"SerialPlugin", "primitiveSerialPortWriteByName", (void*)primitiveSerialPortWriteByName}, {"SerialPlugin", "setInterpreter", (void*)setInterpreter}, {"SerialPlugin", "shutdownModule", (void*)shutdownModule}, {NULL, NULL, NULL}

1 0

another bug: crash when the camera is used
by Matthew Miller 31 Jan '13

31 Jan '13

When I hit the "camera" button in Scratch, the squeak vm segfaults. $ /usr/bin/squeak -encoding UTF-8 -vm-sound-pulse /usr/share/scratch/Scratch.image Segmentation fault 12585548 BitBlt>setDestForm: 12585332 BitBlt class>toForm: 12585240 WarpBlt class>toForm: 12585148 ScratchCameraDialog>step 12585056 Morph>stepAt: 12577780 [] in PasteUpMorph>runStepMethods 12577412 OrderedCollection>do: 12577504 [] in PasteUpMorph>runStepMethods 12577296 BlockContext>ifError: 12577204 PasteUpMorph>runStepMethods 11817504 PasteUpMorph>doOneCycleNow 11817412 PasteUpMorph>doOneCycle 4967164 [] in Project>spawnNewProcess 4967256 [] in BlockContext>newProcess Aborted (core dumped) I'm running squeak-vm-4.10.2.2614 on Fedora 18. -- Matthew Miller mattdm(a)mattdm.org <http://mattdm.org/>

1 0

[commit][2676] CogVM source as per VMMaker.oscog-eem.261.
by commits＠squeakvm.org 31 Jan '13

31 Jan '13

Revision: 2676 Author: eliot Date: 2013-01-30 17:42:03 -0800 (Wed, 30 Jan 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.261. Move determination of the ammount of headroom to the platform in osCogStackPageHeadroom (in the various sqFooMain.c files). Provide a routine to monitor the ammount of unused headroom, which requires the stack memory be zeroed before use. Assume the platform will provide a -reportheadroom flag for enabling the report. Provide primitiveMinimumUnusedHeadroom for in-image access. Add some asserts to check that a page's frame pointer is always in range (setHeadFP:andSP:inPage: already did this). Add the GdbARMPlugin. Correct cygwin HowToBuilds. Nuke the sparseimage in the Newspeak mac installer. Add the named serial port read & write primitives to the SerialPlugin. Fix change history upload in uploadvms script. Modified Paths: -------------- branches/Cog/cygwinbuild/HowToBuild branches/Cog/nscogbuild/cygwinbuild/HowToBuild branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h branches/Cog/platforms/unix/vm/sqPlatformSpecific.h branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/win32/vm/sqPlatformSpecific.h branches/Cog/platforms/win32/vm/sqWin32Intel.c branches/Cog/platforms/win32/vm/sqWin32Window.c branches/Cog/scripts/uploadvms branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h Added Paths: ----------- branches/Cog/src/plugins/GdbARMPlugin/ branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c Property Changed: ---------------- branches/Cog/ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog ___________________________________________________________________ Modified: svn:ignore - README.* *.app *.dmg *.msi *.tgz *.zip Cog.app CogMT.app coglinux cogmtlinux cogwin cogmtwin Newspeak Virtual Machine.app nsvmwin nsvmlinux + ChangeHistory MVALOG README.* *.app *.dmg *.msi *.tgz *.zip cogastlinux cogdbglinux coglinux cogmtlinux cogwin cogmtwin nsvmlinux nsvmlinuxast nsvmlinuxdbg nsvmwin Modified: branches/Cog/cygwinbuild/HowToBuild =================================================================== --- branches/Cog/cygwinbuild/HowToBuild 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/cygwinbuild/HowToBuild 2013-01-31 01:42:03 UTC (rev 2676) @@ -23,7 +23,7 @@ svn co http://www.squeakvm.org/svn/squeak/branches/Cog oscogvm 3. Open a cygwin bash shell, cd into the cygwinbuild directory and execute - mvm + ./mvm Caution: if you previously used the mingw gnutools approach, you probably have a path to that 2.x gcc in your Windows PATH. Make sure that 'which gcc' @@ -34,7 +34,9 @@ make CC=gcc-3 LD=gcc-3 DLLWRAP='dllwrap -mno-cygwin --driver-name gcc-3' 4. At the end of this process you should have a brand new Croquet VM in the - cygwinbuild/build/vm folder (make sure you copy Croquet.map along with it) + cygwinbuild/build/vm folder (make sure you copy Croquet.map along with it). + Putting the relevant sources file(s) (e.g. SqueakV41.sources) in the vm + folder is then all you need to use that vm to run images. N.B. The plugin set is defined by plugins.ext and plugins.int in the build dir. Modified: branches/Cog/nscogbuild/cygwinbuild/HowToBuild =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/HowToBuild 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/nscogbuild/cygwinbuild/HowToBuild 2013-01-31 01:42:03 UTC (rev 2676) @@ -24,7 +24,7 @@ 3. Open a cygwin bash shell, cd into the nscogbuild/cygwinbuild directory and execute - mvm + ./mvm Caution: if you previously used the mingw gnutools approach, you probably have a path to that 2.x gcc in your Windows PATH. Make sure that 'which gcc' Modified: branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk =================================================================== --- branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/nscogbuild/macbuild/installer/installer-Darwin.gmk 2013-01-31 01:42:03 UTC (rev 2676) @@ -2,7 +2,7 @@ $(VM_DMG): $(VM_BUNDLE) $(INSTALLER_BACKGROUND).png LayoutDiskImage.applescript $(INSTALLER_ICON).icns -hdiutil eject '/Volumes/$(PRODUCT_NAME)' - -rm -f "$@.sparseimage" "$@" + -rm -f "$@.sparseimage" "$@" hdiutil create -size 100m -type SPARSE -volname $(VM_LOCALIZED_NAME_ESC) -fs 'Journaled HFS+' "$@.sparseimage" hdiutil attach "$@.sparseimage" mkdir -p '/Volumes/$(PRODUCT_NAME)/.background' @@ -15,6 +15,7 @@ osascript LayoutDiskImage.applescript while test -e '/Volumes/$(PRODUCT_NAME)' ; do echo Waiting for Finder to eject '/Volumes/$(PRODUCT_NAME)'; sleep 2; done hdiutil convert "$@.sparseimage" -format UDBZ -o $(VM_DMG) + -rm -f "$@.sparseimage" .DEFAULT_GOAL := $(VM_DMG) Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-01-31 01:42:03 UTC (rev 2676) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.256 uuid: bfea3efd-4e81-4e85-922e-cf4f58ee5d64 + CCodeGenerator VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 from - StackToRegisterMappingCogit VMMaker.oscog-eem.256 uuid: bfea3efd-4e81-4e85-922e-cf4f58ee5d64 + StackToRegisterMappingCogit VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.256 uuid: bfea3efd-4e81-4e85-922e-cf4f58ee5d64 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -241,6 +241,7 @@ #define Label 1 #define LastJump 39 #define LFENCE 107 +#define LinkReg -17 #define LOCK 110 #define LoadEffectiveAddressMwrR 67 #define LogicalShiftLeftCqR 73 @@ -1015,7 +1016,6 @@ static CogSimStackEntry ssTopDescriptor(void); static CogSimStackEntry * ssValue(sqInt n); static sqInt stackBytesForNumArgs(AbstractInstruction * self_in_stackBytesForNumArgs, sqInt numArgs); -sqInt stackPageHeadroomBytes(void); static sqInt stackPageInterruptHeadroomBytes(AbstractInstruction * self_in_stackPageInterruptHeadroomBytes); static void storeLiteralbeforeFollowingAddress(AbstractInstruction * self_in_storeLiteralbeforeFollowingAddress, sqInt literal, sqInt followingAddress); static void storeToReg(CogSimStackEntry * self_in_storeToReg, sqInt reg); @@ -3721,6 +3721,10 @@ /* begin MoveCq:R: */ stackOverflowCall = genoperandoperand(MoveCqR, 0, ReceiverResultReg); + if (hasLinkRegister(backEnd)) { + /* begin PushR: */ + genoperand(PushR, LinkReg); + } /* begin Call: */ callTarget = methodAbortTrampolineFor(methodOrBlockNumArgs); sendMissCall = genoperand(Call, callTarget); @@ -4871,10 +4875,16 @@ back in resultRegOrNil. Hack: a negative value indicates an abstract register, a non-negative value indicates a constant. */ +/* If on a RISC processor the return address needs to be pushed to the + stack so that the interpreter sees the same stack layout as on CISC. */ static void compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(void *aRoutine, sqInt callJumpBar, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt resultRegOrNil) { + if (hasLinkRegister(backEnd)) { + /* begin PushR: */ + genoperand(PushR, LinkReg); + } genSaveStackPointers(); genLoadCStackPointers(); if (cStackAlignment > BytesPerWord) { @@ -4940,6 +4950,10 @@ } } genLoadStackPointers(); + if (hasLinkRegister(backEnd)) { + /* begin PopR: */ + genoperand(PopR, LinkReg); + } /* begin RetN: */ genoperand(RetN, 0); } @@ -17812,15 +17826,6 @@ } -/* Delegate this to the processor... */ - -sqInt -stackPageHeadroomBytes(void) -{ - return stackPageInterruptHeadroomBytes(backEnd); -} - - /* Return a minimum amount of headroom for each stack page (in bytes). In a JIT the stack has to have room for interrupt handlers which will run on the stack. Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-01-31 01:42:03 UTC (rev 2676) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.256 uuid: bfea3efd-4e81-4e85-922e-cf4f58ee5d64 + CCodeGenerator VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 */ @@ -66,7 +66,6 @@ void setBreakMethod(sqInt anObj); void setPostCompileHook(void (*aFunction)(CogMethod *, void *)); void setSelectorOfto(CogMethod *cogMethod, sqInt aSelectorOop); -sqInt stackPageHeadroomBytes(void); sqInt traceLinkedSendOffset(void); void unlinkAllSends(void); void unlinkSendsOfisMNUSelector(sqInt selector, sqInt isMNUSelector); Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-01-31 01:42:03 UTC (rev 2676) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.256 uuid: bfea3efd-4e81-4e85-922e-cf4f58ee5d64 + CCodeGenerator VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-01-31 01:42:03 UTC (rev 2676) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.258 uuid: da1433f1-de50-475f-be33-f462b300a2ea + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 from - CoInterpreter VMMaker.oscog-eem.258 uuid: da1433f1-de50-475f-be33-f462b300a2ea + CoInterpreter VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.258 uuid: da1433f1-de50-475f-be33-f462b300a2ea " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -715,6 +715,7 @@ CogMethod * mframeHomeMethod(char *theFP); static sqInt mframeIsBlockActivation(char *theFP); static sqInt mframeReceiver(char *theFP); +static sqInt minimumUnusedHeadroom(void); sqInt mMethodClass(void); static sqInt mnuMethodOrNilFor(sqInt rcvr); EXPORT(void) moduleUnloaded(char *aModuleName); @@ -904,6 +905,7 @@ EXPORT(void) primitiveMethodXray(void); static void primitiveMillisecondClock(void); EXPORT(sqInt) primitiveMillisecondClockMask(void); +EXPORT(void) primitiveMinimumUnusedHeadroom(void); static void primitiveMod(void); EXPORT(void) primitiveModLargeIntegers(void); static void primitiveMouseButtons(void); @@ -1065,6 +1067,7 @@ static sqInt removeFirstLinkOfList(sqInt aList); EXPORT(sqInt) removeGCRoot(sqInt *varLoc); static sqInt removeYoungRoot(sqInt obj); +void reportMinimumUnusedHeadroom(void); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut); static sqInt resumepreemptedYieldingIffrom(sqInt aProcess, sqInt yieldImplicitly, sqInt sourceCode); EXPORT(sqInt) returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext); @@ -1210,8 +1213,8 @@ _iss usqInt memoryLimit; _iss usqInt endOfMemory; _iss StackPage * mostRecentlyUsedPage; +_iss sqInt numStackPages; _iss usqInt scavengeThreshold; -_iss sqInt numStackPages; _iss unsigned char primTraceLogIndex; _iss sqLong nextProfileTick; _iss sqInt needGCFlag; @@ -1937,7 +1940,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.258"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.261"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -2013,9 +2016,11 @@ stackPageBytes = stackPageByteSize(); stackPagesBytes = (GIV(numStackPages) * ((sizeof(CogStackPage)) + (stackPageByteSize()))) + BytesPerWord; theStackMemory = alloca(stackPagesBytes); + memset(theStackMemory, 0, stackPagesBytes); sqMakeMemoryNotExecutableFromTo(((usqInt)(startOfMemory())), ((usqInt)GIV(memoryLimit))); sqMakeMemoryNotExecutableFromTo(((usqInt)theStackMemory), (((usqInt)theStackMemory)) + stackPagesBytes); initializeStacknumSlotspageSize(theStackMemory, ((sqInt) stackPagesBytes >> 2), ((sqInt) stackPageBytes >> 2)); + assert((minimumUnusedHeadroom()) == stackPageBytes); loadInitialContext(); ioInitHeartbeat(); initialEnterSmalltalkExecutive(); @@ -23718,7 +23723,7 @@ page = stackPageAtpages(index, GIV(pages)); (page->lastAddress = theStackPages + (index * GIV(bytesPerPage))); (page->baseAddress = ((page->lastAddress)) + GIV(bytesPerPage)); - (page->stackLimit = ((page->baseAddress)) - (((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - ((stackPageHeadroomBytes()) + 1024))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - ((stackPageHeadroomBytes()) + 1024))))); + (page->stackLimit = ((page->baseAddress)) - (((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))); (page->realStackLimit = (page->stackLimit)); (page->baseFP = 0); (page->nextPage = stackPageAt((index == (numPages - 1) @@ -24218,6 +24223,8 @@ assert((isOopCompiledMethod(GIV(newMethod))) && ((primitiveIndexOf(GIV(newMethod))) != 0)); } + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); (GIV(stackPage)->headFP = GIV(framePointer)); if ((((unsigned long) primitiveFunctionPointer)) <= MaxQuickPrimitiveIndex) { externalQuickPrimitiveResponse(); @@ -28145,6 +28152,39 @@ return longAt(theFP + FoxMFReceiver); } + +/* Traverse all stack pages looking for non-zero bytes in the headroom part + of each page. + Answer the minimum size of unused headroom (zero bytes) in the pages. This + is for + checking that there is enough headroom allocated in stack pages. */ + +static sqInt +minimumUnusedHeadroom(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt i; + sqInt minUnused; + char *p; + StackPage *page; + sqInt unused; + + minUnused = ((stackPageAt(0)->baseAddress)) - ((stackPageAt(0)->lastAddress)); + for (i = 0; i <= (GIV(numStackPages) - 1); i += 1) { + /* begin stackPageAt: */ + page = stackPageAtpages(i, GIV(pages)); + p = (page->lastAddress); + do { + p += BytesPerWord; + } while(((longAtPointer(p)) == 0) + && (p <= ((page->baseAddress)))); + unused = (p - BytesPerWord) - ((page->lastAddress)); + if (unused < minUnused) { + minUnused = unused; + } + } + return minUnused; +} + sqInt mMethodClass(void) { @@ -28335,6 +28375,8 @@ callerIP = ceReturnToInterpreterPC(); } longAtput(theFP + stackedReceiverOffset, callerIP); + assert((callerFP < ((oldPage->baseAddress))) + && (callerFP > (((oldPage->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); (oldPage->headFP = callerFP); (oldPage->headSP = theFP + stackedReceiverOffset); longAtput(newFP + FoxCallerSavedIP, ceBaseFrameReturnPC()); @@ -38381,6 +38423,20 @@ GIV(stackPointer) = sp; } +EXPORT(void) +primitiveMinimumUnusedHeadroom(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt oop; + char *sp; + + /* begin methodReturnValue: */ + oop = (((minimumUnusedHeadroom()) << 1) | 1); + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), oop); + GIV(stackPointer) = sp; + 0; +} + static void primitiveMod(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT @@ -47257,6 +47313,15 @@ } +/* Report the stack page size and minimum unused headroom to stdout. */ + +void +reportMinimumUnusedHeadroom(void) +{ + printf("stack page size %ld minimum unused stack headroom %ld bytes\n", stackPageByteSize(), minimumUnusedHeadroom()); +} + + /* Restore headers smashed by forwarding links */ static void @@ -49548,7 +49613,7 @@ static sqInt stackLimitBytes(void) { - return ((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - ((stackPageHeadroomBytes()) + 1024))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - ((stackPageHeadroomBytes()) + 1024))); + return ((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))); } @@ -49625,7 +49690,7 @@ sqInt pageBytes; sqInt smallSize; - pageBytes = (512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024); + pageBytes = (512 + ((IFrameSlots + 64) * BytesPerWord)) + (osCogStackPageHeadroom()); if ((pageBytes & (pageBytes - 1)) == 0) { /* = 0 => a power of two */ @@ -49658,14 +49723,14 @@ /* Return a minimum amount of headroom for each stack page (in bytes). - In a JIT the stack has to have room for interrupt handlers which will run - on the - stack. In the interpreter we don't actually need any headroom. */ + In the interpreter we don't actually need any headroom. In a JIT the stack + has to have room for interrupt handlers which will run on the stack. + Defer to the platform for this one. */ static sqInt stackPageHeadroom(void) { - return (stackPageHeadroomBytes()) + 1024; + return osCogStackPageHeadroom(); } usqInt @@ -52294,6 +52359,7 @@ {"", "primitiveLongRunningPrimitiveSemaphore", (void*)primitiveLongRunningPrimitiveSemaphore}, {"", "primitiveMethodXray", (void*)primitiveMethodXray}, {"", "primitiveMillisecondClockMask", (void*)primitiveMillisecondClockMask}, + {"", "primitiveMinimumUnusedHeadroom", (void*)primitiveMinimumUnusedHeadroom}, {"", "primitiveModLargeIntegers", (void*)primitiveModLargeIntegers}, {"", "primitiveMultiplyLargeIntegers", (void*)primitiveMultiplyLargeIntegers}, {"", "primitiveNotEqualLargeIntegers", (void*)primitiveNotEqualLargeIntegers}, Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-01-31 01:42:03 UTC (rev 2676) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.258 uuid: da1433f1-de50-475f-be33-f462b300a2ea + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 */ @@ -173,6 +173,7 @@ sqInt rawHeaderOf(sqInt methodPointer); void rawHeaderOfput(sqInt methodOop, sqInt cogMethodOrMethodHeader); sqInt remap(sqInt oop); +void reportMinimumUnusedHeadroom(void); usqInt scavengeThresholdAddress(void); void scheduleIncrementalGC(void); void setBreakSelector(char *aString); Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-31 01:42:03 UTC (rev 2676) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.258 uuid: da1433f1-de50-475f-be33-f462b300a2ea + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 from - CoInterpreter VMMaker.oscog-eem.258 uuid: da1433f1-de50-475f-be33-f462b300a2ea + CoInterpreter VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.258 uuid: da1433f1-de50-475f-be33-f462b300a2ea " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -718,6 +718,7 @@ CogMethod * mframeHomeMethod(char *theFP); static sqInt mframeIsBlockActivation(char *theFP); static sqInt mframeReceiver(char *theFP); +static sqInt minimumUnusedHeadroom(void); sqInt mMethodClass(void); static sqInt mnuMethodOrNilFor(sqInt rcvr); EXPORT(void) moduleUnloaded(char *aModuleName); @@ -907,6 +908,7 @@ EXPORT(void) primitiveMethodXray(void); static void primitiveMillisecondClock(void); EXPORT(sqInt) primitiveMillisecondClockMask(void); +EXPORT(void) primitiveMinimumUnusedHeadroom(void); static void primitiveMod(void); EXPORT(void) primitiveModLargeIntegers(void); static void primitiveMouseButtons(void); @@ -1068,6 +1070,7 @@ static sqInt removeFirstLinkOfList(sqInt aList); EXPORT(sqInt) removeGCRoot(sqInt *varLoc); static sqInt removeYoungRoot(sqInt obj); +void reportMinimumUnusedHeadroom(void); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut); static sqInt resumepreemptedYieldingIffrom(sqInt aProcess, sqInt yieldImplicitly, sqInt sourceCode); EXPORT(sqInt) returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext); @@ -1213,8 +1216,8 @@ _iss usqInt memoryLimit; _iss usqInt endOfMemory; _iss StackPage * mostRecentlyUsedPage; +_iss sqInt numStackPages; _iss usqInt scavengeThreshold; -_iss sqInt numStackPages; _iss unsigned char primTraceLogIndex; _iss sqLong nextProfileTick; _iss sqInt needGCFlag; @@ -1940,7 +1943,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.258"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.261"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -2022,9 +2025,11 @@ stackPageBytes = stackPageByteSize(); stackPagesBytes = (GIV(numStackPages) * ((sizeof(CogStackPage)) + (stackPageByteSize()))) + BytesPerWord; theStackMemory = alloca(stackPagesBytes); + memset(theStackMemory, 0, stackPagesBytes); sqMakeMemoryNotExecutableFromTo(((usqInt)(startOfMemory())), ((usqInt)GIV(memoryLimit))); sqMakeMemoryNotExecutableFromTo(((usqInt)theStackMemory), (((usqInt)theStackMemory)) + stackPagesBytes); initializeStacknumSlotspageSize(theStackMemory, ((sqInt) stackPagesBytes >> 2), ((sqInt) stackPageBytes >> 2)); + assert((minimumUnusedHeadroom()) == stackPageBytes); loadInitialContext(); ioInitHeartbeat(); initialEnterSmalltalkExecutive(); @@ -23727,7 +23732,7 @@ page = stackPageAtpages(index, GIV(pages)); (page->lastAddress = theStackPages + (index * GIV(bytesPerPage))); (page->baseAddress = ((page->lastAddress)) + GIV(bytesPerPage)); - (page->stackLimit = ((page->baseAddress)) - (((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - ((stackPageHeadroomBytes()) + 1024))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - ((stackPageHeadroomBytes()) + 1024))))); + (page->stackLimit = ((page->baseAddress)) - (((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))))); (page->realStackLimit = (page->stackLimit)); (page->baseFP = 0); (page->nextPage = stackPageAt((index == (numPages - 1) @@ -24227,6 +24232,8 @@ assert((isOopCompiledMethod(GIV(newMethod))) && ((primitiveIndexOf(GIV(newMethod))) != 0)); } + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); (GIV(stackPage)->headFP = GIV(framePointer)); if ((((unsigned long) primitiveFunctionPointer)) <= MaxQuickPrimitiveIndex) { externalQuickPrimitiveResponse(); @@ -28154,6 +28161,39 @@ return longAt(theFP + FoxMFReceiver); } + +/* Traverse all stack pages looking for non-zero bytes in the headroom part + of each page. + Answer the minimum size of unused headroom (zero bytes) in the pages. This + is for + checking that there is enough headroom allocated in stack pages. */ + +static sqInt +minimumUnusedHeadroom(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt i; + sqInt minUnused; + char *p; + StackPage *page; + sqInt unused; + + minUnused = ((stackPageAt(0)->baseAddress)) - ((stackPageAt(0)->lastAddress)); + for (i = 0; i <= (GIV(numStackPages) - 1); i += 1) { + /* begin stackPageAt: */ + page = stackPageAtpages(i, GIV(pages)); + p = (page->lastAddress); + do { + p += BytesPerWord; + } while(((longAtPointer(p)) == 0) + && (p <= ((page->baseAddress)))); + unused = (p - BytesPerWord) - ((page->lastAddress)); + if (unused < minUnused) { + minUnused = unused; + } + } + return minUnused; +} + sqInt mMethodClass(void) { @@ -28344,6 +28384,8 @@ callerIP = ceReturnToInterpreterPC(); } longAtput(theFP + stackedReceiverOffset, callerIP); + assert((callerFP < ((oldPage->baseAddress))) + && (callerFP > (((oldPage->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); (oldPage->headFP = callerFP); (oldPage->headSP = theFP + stackedReceiverOffset); longAtput(newFP + FoxCallerSavedIP, ceBaseFrameReturnPC()); @@ -38390,6 +38432,20 @@ GIV(stackPointer) = sp; } +EXPORT(void) +primitiveMinimumUnusedHeadroom(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt oop; + char *sp; + + /* begin methodReturnValue: */ + oop = (((minimumUnusedHeadroom()) << 1) | 1); + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), oop); + GIV(stackPointer) = sp; + 0; +} + static void primitiveMod(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT @@ -47266,6 +47322,15 @@ } +/* Report the stack page size and minimum unused headroom to stdout. */ + +void +reportMinimumUnusedHeadroom(void) +{ + printf("stack page size %ld minimum unused stack headroom %ld bytes\n", stackPageByteSize(), minimumUnusedHeadroom()); +} + + /* Restore headers smashed by forwarding links */ static void @@ -49557,7 +49622,7 @@ static sqInt stackLimitBytes(void) { - return ((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - ((stackPageHeadroomBytes()) + 1024))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - ((stackPageHeadroomBytes()) + 1024))); + return ((512 < (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))) ? 512 : (((stackPageByteSize()) - ((IFrameSlots + 64) * BytesPerWord)) - (osCogStackPageHeadroom()))); } @@ -49634,7 +49699,7 @@ sqInt pageBytes; sqInt smallSize; - pageBytes = (512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024); + pageBytes = (512 + ((IFrameSlots + 64) * BytesPerWord)) + (osCogStackPageHeadroom()); if ((pageBytes & (pageBytes - 1)) == 0) { /* = 0 => a power of two */ @@ -49667,14 +49732,14 @@ /* Return a minimum amount of headroom for each stack page (in bytes). - In a JIT the stack has to have room for interrupt handlers which will run - on the - stack. In the interpreter we don't actually need any headroom. */ + In the interpreter we don't actually need any headroom. In a JIT the stack + has to have room for interrupt handlers which will run on the stack. + Defer to the platform for this one. */ static sqInt stackPageHeadroom(void) { - return (stackPageHeadroomBytes()) + 1024; + return osCogStackPageHeadroom(); } usqInt @@ -52303,6 +52368,7 @@ {"", "primitiveLongRunningPrimitiveSemaphore", (void*)primitiveLongRunningPrimitiveSemaphore}, {"", "primitiveMethodXray", (void*)primitiveMethodXray}, {"", "primitiveMillisecondClockMask", (void*)primitiveMillisecondClockMask}, + {"", "primitiveMinimumUnusedHeadroom", (void*)primitiveMinimumUnusedHeadroom}, {"", "primitiveModLargeIntegers", (void*)primitiveModLargeIntegers}, {"", "primitiveMultiplyLargeIntegers", (void*)primitiveMultiplyLargeIntegers}, {"", "primitiveNotEqualLargeIntegers", (void*)primitiveNotEqualLargeIntegers}, Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/nscogsrc/vm/interp.h 2013-01-31 01:42:03 UTC (rev 2676) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.258 uuid: da1433f1-de50-475f-be33-f462b300a2ea + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-31 01:42:03 UTC (rev 2676) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.258 uuid: da1433f1-de50-475f-be33-f462b300a2ea + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.261 uuid: eeb310a3-23e0-41f6-8a92-5749b798e623 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Jan 18 11:18:01 PST 2013 + Wed Jan 30 17:41:13 PST 2013 Modified: branches/Cog/platforms/Mac OS/vm/sqMacMain.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2013-01-31 01:42:03 UTC (rev 2676) @@ -77,6 +77,7 @@ #include <objc/objc-runtime.h> #include "sq.h" +#include "sqAssert.h" #include "sqMacUIConstants.h" #include "sqMacMain.h" #include "sqMacUIMenuBar.h" @@ -107,6 +108,7 @@ # include <execinfo.h> # define BACKTRACE_DEPTH 64 #endif +#include <signal.h> #include <sys/ucontext.h> extern pthread_mutex_t gEventQueueLock,gSleepLock; @@ -235,6 +237,10 @@ #if STACKVM printf("\nMost recent primitives\n"); dumpPrimTraceLog(); +# if COGVM + printf("\n"); + reportMinimumUnusedHeadroom(); +# endif #endif printf("\n\t(%s)\n", msg); fflush(stdout); @@ -541,6 +547,11 @@ ioExitWithErrorCode(int ec) { extern void printPhaseTime(int); +#if COGVM +extern sqInt reportStackHeadroom; + if (reportStackHeadroom) + reportMinimumUnusedHeadroom(); +#endif printPhaseTime(3); UnloadScrap(); ioShutdownAllModules(); @@ -1018,6 +1029,8 @@ * Support code for Cog. * a) Answer whether the C frame pointer is in use, for capture of the C stack * pointers. + * b) answer the amount of stack room to ensure in a Cog stack page, including + * the size of the redzone, if any. */ # if defined(i386) || defined(__i386) || defined(__i386__) /* @@ -1040,4 +1053,51 @@ return CFramePointer >= CStackPointer && CFramePointer <= currentCSP; } # endif /* defined(i386) || defined(__i386) || defined(__i386__) */ + +/* Answer an approximation of the size of the redzone (if any). Do so by + * sending a signal to the process and computing the difference between the + * stack pointer in the signal handler and that in the caller. Assumes stacks + * descend. + */ + +#if !defined(min) +# define min(x,y) (((x)>(y))?(y):(x)) +#endif +static char *p = 0; + +static void +sighandler(int sig) { p = (char *)&sig; } + +static int +getRedzoneSize() +{ + struct sigaction handler_action, old; + handler_action.sa_sigaction = sighandler; + handler_action.sa_flags = SA_NODEFER | SA_SIGINFO; + sigemptyset(&handler_action.sa_mask); + (void)sigaction(SIGPROF, &handler_action, &old); + + do kill(getpid(),SIGPROF); while (!p); + (void)sigaction(SIGPROF, &old, 0); + return (char *)min(&old,&handler_action) - sizeof(struct sigaction) - p; +} + +sqInt reportStackHeadroom; +static int stackPageHeadroom; + +/* Answer the redzone size plus space for any signal handlers to run in. + * N.B. Space for signal handers may include space for the dynamic linker to + * run in since signal handlers may reference other functions, and linking may + * be lazy. The reportheadroom switch can be used to check empirically that + * there is sufficient headroom. At least on Mac OS X we see no large stack + * usage that would indicate e.g. dynamic linking in signal handlers. + * So answer only the redzone size and likely get small (2048 byte) pages. + */ +int +osCogStackPageHeadroom() +{ + if (!stackPageHeadroom) + stackPageHeadroom = getRedzoneSize(); + return stackPageHeadroom; +} #endif /* COGVM */ Modified: branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2013-01-31 01:42:03 UTC (rev 2676) @@ -205,6 +205,10 @@ extern sqInt pollpip; pollpip = atoi(argv[1]); return 2; } + else if (!strcmp(argv[0], "-reportheadroom")) { + extern sqInt reportStackHeadroom; + reportStackHeadroom = 1; + return 1; } #endif /* STACKVM */ #if COGVM else if (!strcmp(argv[0], "-codesize")) { Modified: branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h 2013-01-31 01:42:03 UTC (rev 2676) @@ -133,6 +133,8 @@ extern void sqMakeMemoryNotExecutableFromTo(unsigned long, unsigned long); extern int isCFramePointerInUse(void); +extern int osCogStackPageHeadroom(void); +extern void reportMinimumUnusedHeadroom(void); #endif /* warnPrintf is provided (and needed) on the win32 platform. Modified: branches/Cog/platforms/unix/vm/sqPlatformSpecific.h =================================================================== --- branches/Cog/platforms/unix/vm/sqPlatformSpecific.h 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/platforms/unix/vm/sqPlatformSpecific.h 2013-01-31 01:42:03 UTC (rev 2676) @@ -52,6 +52,8 @@ extern void sqMakeMemoryNotExecutableFromTo(unsigned long, unsigned long); extern int isCFramePointerInUse(void); +extern int osCogStackPageHeadroom(void); +extern void reportMinimumUnusedHeadroom(void); #endif /* warnPrintf is provided (and needed) on the win32 platform. Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2013-01-31 01:42:03 UTC (rev 2676) @@ -34,6 +34,7 @@ */ #include "sq.h" +#include "sqAssert.h" #include "sqMemoryAccess.h" #include "sqaio.h" #include "sqUnixCharConv.h" @@ -851,6 +852,10 @@ #if STACKVM printf("\nMost recent primitives\n"); dumpPrimTraceLog(); +# if COGVM + printf("\n"); + reportMinimumUnusedHeadroom(); +# endif #endif printf("\n\t(%s)\n", msg); fflush(stdout); @@ -1363,6 +1368,10 @@ extern sqInt pollpip; pollpip = atoi(argv[1]); return 2; } + else if (!strcmp(argv[0], "-reportheadroom")) { + extern sqInt reportStackHeadroom; + reportStackHeadroom = 1; + return 1; } #endif /* STACKVM */ #if COGVM else if (!strcmp(argv[0], "-codesize")) { @@ -1857,6 +1866,11 @@ sqInt ioExitWithErrorCode(int ec) { +#if COGVM +extern sqInt reportStackHeadroom; + if (reportStackHeadroom) + reportMinimumUnusedHeadroom(); +#endif printPhaseTime(3); dpy->winExit(); exit(ec); @@ -1952,6 +1966,8 @@ * Support code for Cog. * a) Answer whether the C frame pointer is in use, for capture of the C stack * pointers. + * b) answer the amount of stack room to ensure in a Cog stack page, including + * the size of the redzone, if any. */ # if defined(i386) || defined(__i386) || defined(__i386__) /* @@ -1974,4 +1990,49 @@ return CFramePointer >= CStackPointer && CFramePointer <= currentCSP; } # endif /* defined(i386) || defined(__i386) || defined(__i386__) */ + +/* Answer an approximation of the size of the redzone (if any). Do so by + * sending a signal to the process and computing the difference between the + * stack pointer in the signal handler and that in the caller. Assumes stacks + * descend. + */ + +#if !defined(min) +# define min(x,y) (((x)>(y))?(y):(x)) +#endif +static char *p = 0; + +static void +sighandler(int sig) { p = (char *)&sig; } + +static int +getRedzoneSize() +{ + struct sigaction handler_action, old; + handler_action.sa_sigaction = sighandler; + handler_action.sa_flags = SA_NODEFER | SA_SIGINFO; + sigemptyset(&handler_action.sa_mask); + (void)sigaction(SIGPROF, &handler_action, &old); + + do kill(getpid(),SIGPROF); while (!p); + (void)sigaction(SIGPROF, &old, 0); + return (char *)min(&old,&handler_action) - sizeof(struct sigaction) - p; +} + +sqInt reportStackHeadroom; +static int stackPageHeadroom; + +/* Answer the redzone size plus space for any signal handlers to run in. + * N.B. Space for signal handers may include space for the dynamic linker to + * run in since signal handlers may reference other functions, and linking may + * be lazy. The reportheadroom switch can be used to check empirically that + * there is sufficient headroom. + */ +int +osCogStackPageHeadroom() +{ + if (!stackPageHeadroom) + stackPageHeadroom = getRedzoneSize() + 1024; + return stackPageHeadroom; +} #endif /* COGVM */ Modified: branches/Cog/platforms/win32/vm/sqPlatformSpecific.h =================================================================== --- branches/Cog/platforms/win32/vm/sqPlatformSpecific.h 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/platforms/win32/vm/sqPlatformSpecific.h 2013-01-31 01:42:03 UTC (rev 2676) @@ -81,6 +81,8 @@ extern void sqMakeMemoryNotExecutableFromTo(unsigned long, unsigned long); extern int isCFramePointerInUse(void); +extern int osCogStackPageHeadroom(void); +extern void reportMinimumUnusedHeadroom(void); #endif /* Thread support for thread-safe signalSemaphoreWithIndex and/or the COGMTVM */ Modified: branches/Cog/platforms/win32/vm/sqWin32Intel.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Intel.c 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/platforms/win32/vm/sqWin32Intel.c 2013-01-31 01:42:03 UTC (rev 2676) @@ -19,6 +19,7 @@ #include <float.h> #include <ole2.h> #include "sq.h" +#include "sqAssert.h" #include "sqWin32Backtrace.h" #include "sqSCCSVersion.h" #if COGVM @@ -1017,6 +1018,11 @@ sqInt ioExitWithErrorCode(int ec) { +#if COGVM +extern sqInt reportStackHeadroom; + if (reportStackHeadroom) + reportMinimumUnusedHeadroom(); +#endif printPhaseTime(3); inCleanExit = 1; exit(ec); @@ -1132,6 +1138,9 @@ print_backtrace(stdout, nframes, MAXFRAMES, callstack, symbolic_pcs); /* print the caller's stack to stdout */ dumpStackIfInMainThread(0); +#if COGVM + reportMinimumUnusedHeadroom(); +#endif } EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* that's too bad ... */ @@ -1679,6 +1688,10 @@ extern sqInt suppressHeartbeatFlag; suppressHeartbeatFlag = 1; return 1; } + else if (!strcmp(argv[0], "-reportheadroom")) { + extern sqInt reportStackHeadroom; + reportStackHeadroom = 1; + return 1; } #endif /* STACKVM */ #if COGVM else if (!strcmp(argv[0], "-codesize")) { @@ -1895,11 +1908,16 @@ } #if COGVM +#include <signal.h> + /* * Support code for Cog. * a) Answer whether the C frame pointer is in use, for capture of the C stack * pointers. + * b) answer the amount of stack room to ensure in a Cog stack page, including + * the size of the redzone, if any. */ +# if defined(i386) || defined(__i386) || defined(__i386__) /* * Cog has already captured CStackPointer before calling this routine. Record * the original value, capture the pointers again and determine if CFramePointer @@ -1916,9 +1934,60 @@ currentCSP = CStackPointer; ceCaptureCStackPointers(); -#if defined(assert) assert(CStackPointer < currentCSP); -#endif return CFramePointer >= CStackPointer && CFramePointer <= currentCSP; } +# endif /* defined(i386) || defined(__i386) || defined(__i386__) */ + +/* Answer an approximation of the size of the redzone (if any). Do so by + * sending a signal to the process and computing the difference between the + * stack pointer in the signal handler and that in the caller. Assumes stacks + * descend. + */ + +#if !defined(min) +# define min(x,y) (((x)>(y))?(y):(x)) +#endif +static char *p = 0; + +static void +sighandler(int sig) { p = (char *)&sig; } + +static int +getRedzoneSize() +{ +#if defined(SIGPROF) /* cygwin */ + struct sigaction handler_action, old; + handler_action.sa_sigaction = sighandler; + handler_action.sa_flags = SA_NODEFER | SA_SIGINFO; + sigemptyset(&handler_action.sa_mask); + (void)sigaction(SIGPROF, &handler_action, &old); + + do kill(getpid(),SIGPROF); while (!p); + (void)sigaction(SIGPROF, &old, 0); + return (char *)min(&old,&handler_action) - sizeof(struct sigaction) - p; +#else /* cygwin */ + void (*old)(int) = signal(SIGBREAK, sighandler); + + do raise(SIGBREAK); while (!p); + return (char *)&old - p; +#endif /* cygwin */ +} + +sqInt reportStackHeadroom; +static int stackPageHeadroom; + +/* Answer the redzone size plus space for any signal handlers to run in. + * N.B. Space for signal handers may include space for the dynamic linker to + * run in since signal handlers may reference other functions, and linking may + * be lazy. The reportheadroom switch can be used to check empirically that + * there is sufficient headroom. + */ +int +osCogStackPageHeadroom() +{ + if (!stackPageHeadroom) + stackPageHeadroom = getRedzoneSize() + 1024; + return stackPageHeadroom; +} #endif /* COGVM */ Modified: branches/Cog/platforms/win32/vm/sqWin32Window.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Window.c 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/platforms/win32/vm/sqWin32Window.c 2013-01-31 01:42:03 UTC (rev 2676) @@ -3203,6 +3203,7 @@ TEXT("\n\t-stackpages: n \t(use n stack pages)") TEXT("\n\t-numextsems: n \t(allow up to n external semaphores)") TEXT("\n\t-noheartbeat \t(no heartbeat for debug)") + TEXT("\n\t-reportheadroom \t(print unused stack headroom on exit)") #endif /* STACKVM */ #if STACKVM || NewspeakVM # if COGVM Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2013-01-28 01:10:14 UTC (rev 2675) +++ branches/Cog/scripts/uploadvms 2013-01-31 01:42:03 UTC (rev 2676) @@ -90,10 +90,10 @@ echo compiling ChangeHistory THEM="`ls README.* | sort -n -t. -k2 -r`" >ChangeHistory -for r in $MEHT; do +for r in $THEM; do m="`echo $r | sed 's/README.//'`" - if [ $n -ge $m ]; then - test $n -ne $m && echo "-------------------------------" >>ChangeHistory + if [ $REV -ge $m ]; then + test $REV -ne $m && echo "-------------------------------" >>ChangeHistory ls -lT $r | awk '{ print $6, $7, $9; }' >>ChangeHistory if grep -s "^------------" $r >/dev/null; then awk '{if (line>0) print};/^--------/ {line=1}' $r >>ChangeHistory Added: branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c =================================================================== --- branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c (rev 0) +++ branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c 2013-01-31 01:42:03 UTC (rev 2676) @@ -0,0 +1,534 @@ +/* Automatically generated from Squeak on {14 December 2012 . 1:58:09 pm} */ + +static char __buildInfo[] = "Generated on {14 December 2012 . 1:58:09 pm}. Compiled on "__DATE__ ; + + + +#include <math.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> + +/* Default EXPORT macro that does nothing (see comment in sq.h): */ +#define EXPORT(returnType) returnType + +/* Do not include the entire sq.h file but just those parts needed. */ +/* The virtual machine proxy definition */ +#include "sqVirtualMachine.h" +/* Configuration options */ +#include "sqConfig.h" +/* Platform specific definitions */ +#include "sqPlatformSpecific.h" + +#define true 1 +#define false 0 +#define null 0 /* using 'null' because nil is predefined in Think C */ +#ifdef SQUEAK_BUILTIN_PLUGIN +#undef EXPORT +// was #undef EXPORT(returnType) but screws NorCroft cc +#define EXPORT(returnType) static returnType +#endif + +#include "GdbARMPlugin.h" +#include "sqMemoryAccess.h" + + +/*** Constants ***/ +#define BaseHeaderSize 4 +#define BytesPerOop 4 +#define BytesPerWord 4 +#define PrimErrBadReceiver 2 +#define PrimErrInappropriate 6 +#define PrimErrNoMemory 9 + + +/*** Function Prototypes ***/ +static void forceStopOnInterrupt(void); +static VirtualMachine * getInterpreter(void); +EXPORT(const char*) getModuleName(void); +static sqInt halt(void); +static sqInt msg(char *s); +EXPORT(sqInt) primitiveDisassembleAtInMemory(void); +EXPORT(sqInt) primitiveErrorAndLog(void); +EXPORT(sqInt) primitiveFlushICacheFromTo(void); +EXPORT(sqInt) primitiveNewCPU(void); +EXPORT(sqInt) primitiveResetCPU(void); +EXPORT(sqInt) primitiveRunInMemoryMinimumAddressReadWrite(void); +EXPORT(sqInt) primitiveSingleStepInMemoryMinimumAddressReadWrite(void); +EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); +static sqInt sizeField(sqInt rcvr); +static void sqAssert(sqInt aBool); +static sqInt startOfData(sqInt rcvr); + + +/*** Variables ***/ + +#if !defined(SQUEAK_BUILTIN_PLUGIN) +static void * (*arrayValueOf)(sqInt oop); +static sqInt (*byteSizeOf)(sqInt oop); +static sqInt (*classArray)(void); +static sqInt (*classString)(void); +static sqInt (*failed)(void); +static void * (*firstIndexableField)(sqInt oop); +static sqInt (*getInterruptPending)(void); +static sqInt (*instantiateClassindexableSize)(sqInt classPointer, sqInt size); +static sqInt (*integerObjectOf)(sqInt value); +static sqInt (*isWordsOrBytes)(sqInt oop); +static sqInt (*pop)(sqInt nItems); +static sqInt (*popthenPush)(sqInt nItems, sqInt oop); +static sqInt (*popRemappableOop)(void); +static sqInt (*positive32BitIntegerFor)(sqInt integerValue); +static sqInt (*positive32BitValueOf)(sqInt oop); +static sqInt (*primitiveFail)(void); +static sqInt (*primitiveFailFor)(sqInt reasonCode); +static sqInt (*pushRemappableOop)(sqInt oop); +static void (*(*setInterruptCheckChain)(void (*aFunction)(void)))() ; +static sqInt (*stackValue)(sqInt offset); +static sqInt (*storePointerofObjectwithValue)(sqInt index, sqInt oop, sqInt valuePointer); +static sqInt (*success)(sqInt aBoolean); +#else /* !defined(SQUEAK_BUILTIN_PLUGIN) */ +extern void * arrayValueOf(sqInt oop); +extern sqInt byteSizeOf(sqInt oop); +extern sqInt classArray(void); +extern sqInt classString(void); +extern sqInt failed(void); +extern void * firstIndexableField(sqInt oop); +extern sqInt getInterruptPending(void); +extern sqInt instantiateClassindexableSize(sqInt classPointer, sqInt size); +extern sqInt integerObjectOf(sqInt value); +extern sqInt isWordsOrBytes(sqInt oop); +extern sqInt pop(sqInt nItems); +extern sqInt popthenPush(sqInt nItems, sqInt oop); +extern sqInt popRemappableOop(void); +extern sqInt positive32BitIntegerFor(sqInt integerValue); +extern sqInt positive32BitValueOf(sqInt oop); +extern sqInt primitiveFail(void); +extern sqInt primitiveFailFor(sqInt reasonCode); +extern sqInt pushRemappableOop(sqInt oop); +extern void (*setInterruptCheckChain(void (*aFunction)(void)))() ; +extern sqInt stackValue(sqInt offset); +extern sqInt storePointerofObjectwithValue(sqInt index, sqInt oop, sqInt valuePointer); +extern sqInt success(sqInt aBoolean); + +extern +#endif +struct VirtualMachine* interpreterProxy; +static const char *moduleName = +#ifdef SQUEAK_BUILTIN_PLUGIN + "GdbARMPlugin 14 December 2012 (i)" +#else + "GdbARMPlugin 14 December 2012 (e)" +#endif +; + + +static void +forceStopOnInterrupt(void) +{ + if (getInterruptPending()) { + forceStopRunning(); + } +} + + +/* Note: This is coded so that plugins can be run from Squeak. */ + +static VirtualMachine * +getInterpreter(void) +{ + return interpreterProxy; +} + + +/* Note: This is hardcoded so it can be run from Squeak. + The module name is used for validating a module *after* + it is loaded to check if it does really contain the module + we're thinking it contains. This is important! */ + +EXPORT(const char*) +getModuleName(void) +{ + return moduleName; +} + +static sqInt +halt(void) +{ + ; + return 0; +} + +static sqInt +msg(char *s) +{ + fprintf(stderr, "\n%s: %s", moduleName, s); + return 0; +} + + +/* cpuAlien <GdbARMAlien> */ +/* <Integer> */ +/* <Bitmap|ByteArray|WordArray> */ +/* Return an Array of the instruction length and its decompilation as a + string for the instruction at address in memory. + */ + +EXPORT(sqInt) +primitiveDisassembleAtInMemory(void) +{ + unsigned long address; + void *cpu; + sqInt cpuAlien; + sqInt instrLenOrErr; + sqInt log; + sqInt logLen; + sqInt logObj; + sqInt logObjData; + char *memory; + sqInt resultObj; + + address = positive32BitValueOf(stackValue(1)); + success(isWordsOrBytes(stackValue(0))); + memory = ((char *) (firstIndexableField(stackValue(0)))); + cpuAlien = stackValue(2); + if (failed()) { + return null; + } + if (((cpu = ((longAt(cpuAlien + BaseHeaderSize)) > 0 + ? (cpuAlien + BaseHeaderSize) + BytesPerOop + : longAt((cpuAlien + BaseHeaderSize) + BytesPerOop)))) == 0) { + primitiveFailFor(PrimErrBadReceiver); + return null; + } + instrLenOrErr = disassembleForAtInSize(cpu, address, memory, byteSizeOf(((sqInt)(long)(memory) - 4))); + if (instrLenOrErr < 0) { + primitiveFailFor(PrimErrInappropriate); + return null; + } + log = getlog((&logLen)); + resultObj = instantiateClassindexableSize(classArray(), 2); + if (resultObj == 0) { + primitiveFailFor(PrimErrNoMemory); + return null; + } + pushRemappableOop(resultObj); + logObj = instantiateClassindexableSize(classString(), logLen); + if (failed()) { + popRemappableOop(); + primitiveFailFor(PrimErrNoMemory); + return null; + } + logObjData = arrayValueOf(logObj); + memcpy(logObjData, log, logLen); + resultObj = popRemappableOop(); + storePointerofObjectwithValue(0, resultObj, integerObjectOf(instrLenOrErr)); + storePointerofObjectwithValue(1, resultObj, logObj); + if (failed()) { + return null; + } + popthenPush(3, resultObj); + return null; +} + +EXPORT(sqInt) +primitiveErrorAndLog(void) +{ + char *log; + sqInt logLen; + sqInt logObj; + char *logObjData; + sqInt resultObj; + + log = getlog((&logLen)); + resultObj = instantiateClassindexableSize(classArray(), 2); + if (resultObj == 0) { + primitiveFailFor(PrimErrNoMemory); + return null; + } + storePointerofObjectwithValue(0, resultObj, integerObjectOf(errorAcorn())); + if (logLen > 0) { + pushRemappableOop(resultObj); + logObj = instantiateClassindexableSize(classString(), logLen); + if (failed()) { + popRemappableOop(); + primitiveFailFor(PrimErrNoMemory); + return null; + } + resultObj = popRemappableOop(); + logObjData = arrayValueOf(logObj); + memcpy(logObjData, log, logLen); + storePointerofObjectwithValue(1, resultObj, logObj); + } + popthenPush(1, resultObj); + if (failed()) { + return null; + } + return null; +} + + +/* cpuAlien <GdbARMAlien> */ +/* <Integer> */ +/* <Integer> */ +/* Flush the icache in the requested range */ + +EXPORT(sqInt) +primitiveFlushICacheFromTo(void) +{ + void *cpu; + sqInt cpuAlien; + unsigned long endAddress; + unsigned long startAddress; + + startAddress = positive32BitValueOf(stackValue(1)); + endAddress = positive32BitValueOf(stackValue(0)); + cpuAlien = stackValue(2); + if (failed()) { + return null; + } + if (((cpu = ((longAt(cpuAlien + BaseHeaderSize)) > 0 + ? (cpuAlien + BaseHeaderSize) + BytesPerOop + : longAt((cpuAlien + BaseHeaderSize) + BytesPerOop)))) == 0) { + primitiveFailFor(PrimErrBadReceiver); + return null; + } @@ Diff output truncated at 50000 characters. @@

1 0

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

31 Jan '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.261.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.261 Author: eem Time: 30 January 2013, 5:12:32.411 pm UUID: eeb310a3-23e0-41f6-8a92-5749b798e623 Ancestors: VMMaker.oscog-lw.260 Merge with VMMaker.oscog-lw.260, but put push of link register where I think it should go in trampolines. Move determination of the ammount of headroom to the platform in osCogStackPageHeadroom (in the various sqFooMain.c files). Provide a routine to monitor the ammount of unused headroom, which requires the stack memory be zeroed before use. Assume the platform will provide a -reportheadroom flag for enabling the report. Provide primitiveMinimumUnusedHeadroom for in-image access. Add some asserts to check that a page's frame pointer is always in range (setHeadFP:andSP:inPage: already did this). Implement some missing prototypes in InterpreterProxy. Add a comment to preDeclareInterpreterProxyOn: to eyeball all prototypes. =============== Diff against VMMaker.oscog-lw.260 =============== Item was changed: ----- 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: 63) collect: [:shift| 16rFFFFFFFFFFFFFFFF bitClear: (1 bitShift: shift) - 1]) do: - ((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 changed: ----- Method: CoInterpreter>>initStackPagesAndInterpret (in category 'initialization') ----- initStackPagesAndInterpret "Initialize the stack pages and enter interpret. Use alloca'ed memory so that when we have a JIT its stack pointer will be on the native stack since alloca allocates memory on the stack. Certain thread systems use the native stack pointer as the frame ID so putting the stack anywhere else can confuse the thread system." "Override to establish the setjmp/longjmp handler for reentering the interpreter from machine code, and disable executablity on the heap and stack pages." "This should be in its own initStackPages method but Slang can't inline C code strings." | stackPageBytes stackPagesBytes theStackMemory | <var: #theStackMemory type: #'char *'> stackPageBytes := self stackPageByteSize. stackPagesBytes := self computeStackZoneSize. theStackMemory := self cCode: [self alloca: stackPagesBytes] inSmalltalk: [stackPages := self stackPagesClass new. stackPages initializeWithByteSize: stackPagesBytes for: self]. + self cCode: [self me: theStackMemory ms: 0 et: stackPagesBytes]. self sqMakeMemoryNotExecutableFrom: objectMemory startOfMemory asUnsignedInteger To: objectMemory memoryLimit asUnsignedInteger. self sqMakeMemoryNotExecutableFrom: theStackMemory asUnsignedInteger To: theStackMemory asUnsignedInteger + stackPagesBytes. stackPages initializeStack: theStackMemory numSlots: stackPagesBytes / BytesPerWord pageSize: stackPageBytes / BytesPerWord. + self assert: self minimumUnusedHeadroom = stackPageBytes. "Once the stack pages are initialized we can continue to bootstrap the system." self loadInitialContext. "We're ready for the heartbeat (poll interrupt)" self ioInitHeartbeat. self initialEnterSmalltalkExecutive. ^nil! Item was changed: ----- Method: CoInterpreter>>interpretMethodFromMachineCode (in category 'message sending') ----- interpretMethodFromMachineCode "Execute a method interpretively from machine code. We assume (require) that newMethod messageSelector, primitiveFunctionPointer and argumentCount have been set in the caller. Once evaluated either continue in the interpreter via a jongjmp or in machine code via an enilopmart (a form of longjmp - a stinking rose by any other name)." <inline: false> cogit assertCStackWellAligned. self assert: (self validInstructionPointer: instructionPointer inFrame: framePointer). primitiveFunctionPointer ~= 0 ifTrue: [primitiveFunctionPointer = #primitiveInvokeObjectAsMethod ifTrue: [self assert: (objectMemory isOopCompiledMethod: newMethod) not] ifFalse: [self assert: ((objectMemory isOopCompiledMethod: newMethod) and: [(self primitiveIndexOf: newMethod) ~= 0])]. "Invoke an interpreter primitive (because the method is to be interpreted or has not yet been compiled). This is very similar to invoking an interpreter primitive from a compiled primitive (see e.g. SimpleStackBasedCogit>>compileInterpreterPrimitive:). Cut back the stack pointer (done above) to skip the return address and invoke the function. On return if it has succeeded simply continue otherwise restore the stackPointer, collect the pc and interpret. Note that frame building primitives such as primitiveClosureValue, primitiveEvaluateMethod et al will not return but will instead jump into either machine code or longjmp back to the interpreter." "Assign stackPage headFP so we can tell if the primitive built a frame. We can't simply save the framePointer since e.g. assignment to contexts (via primitiveInstVarAt:put:) can change the framePointer. But context assignments will change both the framePointer and stackPage headFP." + + self assert: (framePointer < stackPage baseAddress + and: [framePointer > (stackPage realStackLimit - (LargeContextSize / 2))]). stackPage headFP: framePointer. self isPrimitiveFunctionPointerAnIndex ifTrue: [self externalQuickPrimitiveResponse. primFailCode := 0] ifFalse: [self slowPrimitiveResponse]. self successful ifTrue: [self return: self popStack toExecutive: false "NOTREACHED"]] ifFalse: [self assert: ((objectMemory isOopCompiledMethod: newMethod) and: [(self primitiveIndexOf: newMethod) = 0 or: [(self functionPointerFor: (self primitiveIndexOf: newMethod) inClass: objectMemory nilObject) = 0 or: [self isNullExternalPrimitiveCall: newMethod]]])]. "if not primitive, or primitive failed, activate the method and reenter the interpreter" self activateNewMethod. self siglong: reenterInterpreter jmp: ReturnToInterpreter. "NOTREACHED" ^nil! Item was added: + ----- Method: CoInterpreter>>minimumUnusedHeadroom (in category 'debug support') ----- + minimumUnusedHeadroom + "Traverse all stack pages looking for non-zero bytes in the headroom part of each page. + Answer the minimum size of unused headroom (zero bytes) in the pages. This is for + checking that there is enough headroom allocated in stack pages." + | minUnused page | + <var: #page type: #'StackPage *'> + <var: #p type: #'char *'> + minUnused := (stackPages stackPageAt: 0) baseAddress - (stackPages stackPageAt: 0) lastAddress. + 0 to: numStackPages - 1 do: + [:i| | p unused | + page := stackPages stackPageAt: i. + p := page lastAddress. + [p := p + BytesPerWord. + (self longAtPointer: p) = 0 + and: [p <= page baseAddress]] whileTrue. + unused := p - BytesPerWord - page lastAddress. + unused < minUnused ifTrue: + [minUnused := unused]]. + ^minUnused! Item was changed: ----- Method: CoInterpreter>>moveFramesIn:through:toPage: (in category 'frame access') ----- moveFramesIn: oldPage through: theFP toPage: newPage "Move frames from the hot end of oldPage through to theFP to newPage. This has the effect of making theFP a base frame which can be stored into. Answer theFP's new location." | newSP newFP stackedReceiverOffset delta callerFP callerIP fpInNewPage offsetCallerFP theContext | <inline: false> <var: #oldPage type: #'StackPage *'> <var: #theFP type: #'char *'> <var: #newPage type: #'StackPage *'> <var: #newSP type: #'char *'> <var: #newFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #fpInNewPage type: #'char *'> <var: #offsetCallerFP type: #'char *'> <var: #source type: #'char *'> <returnTypeC: #'char *'> "A base frame must have a context for cannotReturn: processing." self assert: (self isBaseFrame: theFP) not. self assert: self validStackPageBaseFrames. callerFP := self frameCallerFP: theFP. self assert: (self frameHasContext: callerFP). self assert: (self isContext: (self frameContext: callerFP)). theContext := self ensureFrameIsMarried: theFP SP: theFP + ((self isMachineCodeFrame: theFP) ifTrue: [FoxMFReceiver] ifFalse: [FoxIFReceiver]). stackPages longAt: (newSP := newPage baseAddress) put: (self frameContext: callerFP); longAt: (newSP := newSP - BytesPerWord) put: theContext. stackedReceiverOffset := self frameStackedReceiverOffset: theFP. "First move the data, leaving room for the caller and base frame contexts. We will fix up frame pointers later." theFP + stackedReceiverOffset to: oldPage headSP by: BytesPerWord negated do: [:source| newSP := newSP - BytesPerWord. stackPages longAt: newSP put: (stackPages longAt: source)]. "newSP = oldSP + delta => delta = newSP - oldSP" delta := newSP - oldPage headSP. newFP := newPage baseAddress - stackedReceiverOffset - (2 * BytesPerWord). self setHeadFP: oldPage headFP + delta andSP: newSP inPage: newPage. newPage baseFP: newFP. callerIP := self oopForPointer: (self frameCallerSavedIP: theFP). callerIP asUnsignedInteger >= objectMemory startOfMemory ifTrue: [self iframeSavedIP: callerFP put: callerIP. callerIP := cogit ceReturnToInterpreterPC]. stackPages longAt: theFP + stackedReceiverOffset put: callerIP. + self assert: (callerFP < oldPage baseAddress + and: [callerFP > (oldPage realStackLimit - (LargeContextSize / 2))]). oldPage headFP: callerFP; headSP: theFP + stackedReceiverOffset. "Mark the new base frame in the new page" stackPages longAt: newFP + FoxCallerSavedIP put: cogit ceBaseFrameReturnPC; longAt: newFP + FoxSavedFP put: 0. "Now relocate frame pointers, updating married contexts to refer to their moved spouse frames." fpInNewPage := newPage headFP. [offsetCallerFP := self frameCallerFP: fpInNewPage. offsetCallerFP ~= 0 ifTrue: [offsetCallerFP := offsetCallerFP + delta]. stackPages longAt: fpInNewPage + FoxSavedFP put: (self oopForPointer: offsetCallerFP). (self frameHasContext: fpInNewPage) ifTrue: [theContext := self frameContext: fpInNewPage. objectMemory storePointerUnchecked: SenderIndex ofObject: theContext withValue: (self withSmallIntegerTags: fpInNewPage). objectMemory storePointerUnchecked: InstructionPointerIndex ofObject: theContext withValue: (self withSmallIntegerTags: offsetCallerFP)]. fpInNewPage := offsetCallerFP. fpInNewPage ~= 0] whileTrue. self assert: self validStackPageBaseFrames. ^newFP! Item was added: + ----- Method: CoInterpreter>>reportMinimumUnusedHeadroom (in category 'debug support') ----- + reportMinimumUnusedHeadroom + "Report the stack page size and minimum unused headroom to stdout." + <api> + self cCode: + [self prin: 'stack page size %ld minimum unused stack headroom %ld bytes\n' + t: self stackPageByteSize + f: self minimumUnusedHeadroom] + inSmalltalk: + [self print: 'stack page size '; printNum: self stackPageByteSize; + print: ' minimum unused stack headroom '; printNum: self minimumUnusedHeadroom; + print: ' bytes'; cr]! Item was changed: ----- Method: CoInterpreter>>stackPageHeadroom (in category 'stack pages') ----- stackPageHeadroom "Return a minimum amount of headroom for each stack page (in bytes). + In the interpreter we don't actually need any headroom. In a JIT the stack + has to have room for interrupt handlers which will run on the stack. + Defer to the platform for this one." + <inline: true> + ^self osCogStackPageHeadroom! - In a JIT the stack has to have room for interrupt handlers which will run on the - stack. In the interpreter we don't actually need any headroom." - ^cogit stackPageHeadroomBytes + 1024! Item was added: + ----- Method: CoInterpreterPrimitives>>primitiveMinimumUnusedHeadroom (in category 'other primitives') ----- + primitiveMinimumUnusedHeadroom + <export: true> + self methodReturnValue: (self integerObjectOf: self minimumUnusedHeadroom)! Item was added: + TestCase subclass: #CoInterpreterTests + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: 'VMBasicConstants' + category: 'VMMaker-Tests'! Item was added: + ----- Method: CoInterpreterTests>>testMinimumUnusedHeadroom (in category 'tests') ----- + testMinimumUnusedHeadroom + "self new testMinimumUnusedHeadroom" + | ci | + CoInterpreter initializeWithOptions: Dictionary new. + ci := CogVMSimulator new. + ci initStackPagesForTests. + self assert: ci minimumUnusedHeadroom = ci stackPageByteSize. + 0 to: ci stackPageByteSize - 1 by: BytesPerWord do: + [:p| + 0 to: ci numStackPages - 1 do: + [:i| | page | + page := ci stackPages stackPageAt: i. + ci longAt: page baseAddress - p put: 1]. + self assert: ci minimumUnusedHeadroom = (ci stackPageByteSize - (p + BytesPerWord))]! Item was added: + ----- Method: CogClass class>>minimumUnusedStackHeadroom (in category 'system primitives') ----- + minimumUnusedStackHeadroom + "self minimumUnusedStackHeadroom" + <primitive: 'primitiveMinimumUnusedHeadroom'> + self primitiveFailed! Item was added: + ----- Method: CogVMSimulator>>initStackPagesForTests (in category 'test support') ----- + initStackPagesForTests + numStackPages := 8. + stackPages := self stackPagesClass new. + objectMemory allocateMemoryOfSize: 1024 * 1024. + cogCodeSize := 0. + heapBase := self methodCacheSize + + self primTraceLogSize + + self rumpCStackSize + + self computeStackZoneSize. + self initStackPages! Item was added: + ----- Method: CogVMSimulator>>numStackPages (in category 'test support') ----- + numStackPages + ^numStackPages! Item was added: + ----- Method: CogVMSimulator>>osCogStackPageHeadroom (in category 'stack pages') ----- + osCogStackPageHeadroom + "Notional headroom for the simulator. The platform provides this in the real VM." + ^1024! Item was changed: ----- Method: Cogit>>compileTrampolineFor:callJumpBar:numArgs:arg:arg:arg:arg:saveRegs:resultReg: (in category 'initialization') ----- compileTrampolineFor: aRoutine callJumpBar: callJumpBar "<Boolean>" numArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 saveRegs: saveRegs resultReg: resultRegOrNil "Generate a trampoline with up to four arguments. Generate either a call or a jump to aRoutine as requested by callJumpBar. If generating a call and resultRegOrNil is non-zero pass the C result back in resultRegOrNil. Hack: a negative value indicates an abstract register, a non-negative value indicates a constant." <var: #aRoutine type: #'void *'> <inline: false> + "If on a RISC processor the return address needs to be pushed to the + stack so that the interpreter sees the same stack layout as on CISC." + backEnd hasLinkRegister ifTrue: + [self PushR: LinkReg]. self genSaveStackPointers. self genLoadCStackPointers. cStackAlignment > BytesPerWord ifTrue: [backEnd genAlignCStackSavingRegisters: saveRegs numArgs: numArgs wordAlignment: cStackAlignment / BytesPerWord]. saveRegs ifTrue: [callJumpBar ifFalse: [self error: 'why save registers when you''re not going to return?']. backEnd genSaveRegisters]. numArgs > 0 ifTrue: [numArgs > 1 ifTrue: [numArgs > 2 ifTrue: [numArgs > 3 ifTrue: [regOrConst3 < 0 ifTrue: [backEnd genPassReg: regOrConst3 asArgument: 3] ifFalse: [backEnd genPassConst: regOrConst3 asArgument: 3]]. regOrConst2 < 0 ifTrue: [backEnd genPassReg: regOrConst2 asArgument: 2] ifFalse: [backEnd genPassConst: regOrConst2 asArgument: 2]]. regOrConst1 < 0 ifTrue: [backEnd genPassReg: regOrConst1 asArgument: 1] ifFalse: [backEnd genPassConst: regOrConst1 asArgument: 1]]. regOrConst0 < 0 ifTrue: [backEnd genPassReg: regOrConst0 asArgument: 0] ifFalse: [backEnd genPassConst: regOrConst0 asArgument: 0]]. - backEnd hasLinkRegister - ifTrue: [self gen: PushR operand: LinkReg]. self gen: (callJumpBar ifTrue: [Call] ifFalse: [Jump]) operand: (self cCode: [aRoutine asUnsignedInteger] inSmalltalk: [self simulatedTrampolineFor: aRoutine]). callJumpBar ifTrue: [resultRegOrNil ifNotNil: [backEnd genWriteCResultIntoReg: resultRegOrNil]. saveRegs ifTrue: [numArgs > 0 ifTrue: [backEnd genRemoveNArgsFromStack: numArgs]. resultRegOrNil ifNotNil: [backEnd genRestoreRegsExcept: resultRegOrNil] ifNil: [backEnd genRestoreRegs]]. self genLoadStackPointers. + backEnd hasLinkRegister ifTrue: + [self PopR: LinkReg]. self RetN: 0]! Item was changed: ----- Method: Cogit>>genMethodAbortTrampoline (in category 'initialization') ----- genMethodAbortTrampoline "Generate the abort for a method. This abort performs either a call of ceSICMiss: to handle a single-in-line cache miss or a call of ceStackOverflow: to handle a stack overflow. It distinguishes the two by testing ResultReceiverReg. If the register is zero then this is a stack-overflow because a) the receiver has already been pushed and so can be set to zero before calling the abort, and b) the receiver must always contain an object (and hence be non-zero) on SIC miss." | jumpSICMiss | <var: #jumpSICMiss type: #'AbstractInstruction *'> opcodeIndex := 0. self CmpCq: 0 R: ReceiverResultReg. jumpSICMiss := self JumpNonZero: 0. - backEnd hasLinkRegister - ifTrue: [self MoveR: LinkReg Mw: 0 r: SPReg]. "overwrite send ret address with ceMethodAbortTrampoline call ret address" self compileTrampolineFor: #ceStackOverflow: callJumpBar: true numArgs: 1 arg: SendNumArgsReg arg: nil arg: nil arg: nil saveRegs: false resultReg: nil. jumpSICMiss jmpTarget: self Label. - backEnd hasLinkRegister - ifTrue: [self PushR: LinkReg]. "push ret address for ceMethodAbortTrampoline call" ^self genTrampolineFor: #ceSICMiss: called: 'ceMethodAbort' callJumpBar: true numArgs: 1 arg: ReceiverResultReg arg: nil arg: nil arg: nil saveRegs: false resultReg: nil appendOpcodes: true! Item was removed: - ----- Method: Cogit>>stackPageHeadroomBytes (in category 'jit - api') ----- - stackPageHeadroomBytes - <api> - "Delegate this to the processor..." - ^backEnd stackPageInterruptHeadroomBytes! Item was added: + ----- Method: InterpreterProxy>>callbackEnter: (in category 'callback support') ----- + callbackEnter: callbackID + "Re-enter the interpreter for executing a callback" + <var: #callbackID type: #'sqInt *'> + ^self notYetImplementedError! Item was added: + ----- Method: InterpreterProxy>>callbackLeave: (in category 'callback support') ----- + callbackLeave: cbID + "Leave from a previous callback" + <var: #callbackID type: #'sqInt *'> + ^self notYetImplementedError! Item was changed: ----- Method: InterpreterProxy>>disownVM: (in category 'FFI support') ----- disownVM: flags + ^self notYetImplementedError! - self error: 'not yet implemented in Smalltalk'! Item was changed: ----- Method: InterpreterProxy>>getInterruptPending (in category 'other') ----- getInterruptPending + ^self notYetImplementedError! - self error: 'not yet implemented in Smalltalk'! Item was changed: ----- Method: InterpreterProxy>>getStackPointer (in category 'other') ----- getStackPointer <returnTypeC: #'sqInt *'> + ^self notYetImplementedError! - self error: 'not yet implemented in Smalltalk'! Item was changed: ----- Method: InterpreterProxy>>isOopImmutable: (in category 'testing') ----- isOopImmutable: anOop <api> + ^self notYetImplementedError! - ^self error: 'not yet implemented in Smalltalk'! Item was changed: ----- Method: InterpreterProxy>>isOopMutable: (in category 'testing') ----- isOopMutable: anOop <api> + ^self notYetImplementedError! - ^self error: 'not yet implemented in Smalltalk'! Item was changed: ----- Method: InterpreterProxy>>isYoung: (in category 'FFI support') ----- isYoung: anOop + ^self notYetImplementedError! - self error: 'not yet implemented in Smalltalk'! Item was added: + ----- Method: InterpreterProxy>>notYetImplementedError (in category 'private') ----- + notYetImplementedError + ^self error: 'not yet implemented in Smalltalk'! Item was changed: ----- Method: InterpreterProxy>>ownVM: (in category 'FFI support') ----- ownVM: flags + ^self notYetImplementedError! - self error: 'not yet implemented in Smalltalk'! Item was changed: ----- Method: InterpreterProxy>>setInterruptCheckChain: (in category 'other') ----- setInterruptCheckChain: aFunction <returnTypeC: 'void (*setInterruptCheckChain(void (*aFunction)(void)))()'> <var: #aFunction declareC: 'void (*aFunction)()'> + ^self notYetImplementedError! - self error: 'not yet implemented in Smalltalk'! Item was changed: ----- Method: InterpreterProxy>>signalNoResume: (in category 'callback support') ----- signalNoResume: aSemaphore + ^self notYetImplementedError! - self error: 'not yet implemented in Smalltalk'! Item was changed: ----- Method: StackInterpreter>>initStackPages (in category 'initialization') ----- initStackPages "Initialize the stackPages. This version is only for simulation because Slang refuses to inline it, which makes the alloca invalid." | stackPageBytes stackPagesBytes theStackMemory | stackPageBytes := self stackPageByteSize. stackPagesBytes := self computeStackZoneSize. theStackMemory := self cCode: [self alloca: stackPagesBytes] inSmalltalk: [stackPages := self stackPagesClass new. stackPages initializeWithByteSize: stackPagesBytes for: self]. + self cCode: [self me: theStackMemory ms: 0 et: stackPagesBytes]. stackPages initializeStack: theStackMemory numSlots: stackPagesBytes / BytesPerWord pageSize: stackPageBytes / BytesPerWord! Item was changed: ----- Method: StackInterpreter>>initStackPagesAndInterpret (in category 'initialization') ----- initStackPagesAndInterpret "Initialize the stack pages and enter interpret. Use alloca'ed memory so that when we have a JIT its stack pointer will be on the native stack since alloca allocates memory on the stack. Certain thread systems use the native stack pointer as the frame ID so putting the stack anywhere else can confuse the thread system." "This should be in its own initStackPages method but Slang can't inline C code strings." | stackPageBytes stackPagesBytes theStackMemory | <var: #theStackMemory type: #'void *'> stackPageBytes := self stackPageByteSize. stackPagesBytes := self computeStackZoneSize. theStackMemory := self cCode: [self alloca: stackPagesBytes] inSmalltalk: [stackPages := self stackPagesClass new. stackPages initializeWithByteSize: stackPagesBytes for: self]. + self cCode: [self me: theStackMemory ms: 0 et: stackPagesBytes]. stackPages initializeStack: theStackMemory numSlots: stackPagesBytes / BytesPerWord pageSize: stackPageBytes / BytesPerWord. "Once the stack pages are initialized we can continue to bootstrap the system." self loadInitialContext. "We're ready for the heartbeat (poll interrupt)" self ioInitHeartbeat. self interpret. ^nil! Item was changed: ----- Method: StackInterpreter>>moveFramesIn:through:toPage: (in category 'frame access') ----- moveFramesIn: oldPage through: theFP toPage: newPage "Move frames from the hot end of oldPage through to theFP to newPage. This has the effect of making theFP a base frame which can be stored into. Answer theFP's new location." | newSP newFP stackedReceiverOffset delta callerFP callerIP fpInNewPage offsetCallerFP theContext | <inline: false> <var: #oldPage type: #'StackPage *'> <var: #theFP type: #'char *'> <var: #newPage type: #'StackPage *'> <var: #newSP type: #'char *'> <var: #newFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #fpInNewPage type: #'char *'> <var: #offsetCallerFP type: #'char *'> <var: #source type: #'char *'> <returnTypeC: 'char *'> newSP := newPage baseAddress + BytesPerWord. stackedReceiverOffset := self frameStackedReceiverOffset: theFP. "First move the data. We will fix up frame pointers later." theFP + stackedReceiverOffset to: oldPage headSP by: BytesPerWord negated do: [:source| newSP := newSP - BytesPerWord. stackPages longAt: newSP put: (stackPages longAt: source)]. "newSP = oldSP + delta => delta = newSP - oldSP" delta := newSP - oldPage headSP. newFP := newPage baseAddress - stackedReceiverOffset. self setHeadFP: oldPage headFP + delta andSP: newSP inPage: newPage. newPage baseFP: newFP. callerFP := self frameCallerFP: theFP. self assert: (self isBaseFrame: theFP) not. self assert: (self frameHasContext: callerFP). callerIP := self oopForPointer: (self frameCallerSavedIP: theFP). stackPages longAt: theFP + stackedReceiverOffset put: callerIP. + self assert: (callerFP < oldPage baseAddress + and: [callerFP > (oldPage realStackLimit - (LargeContextSize / 2))]). oldPage headFP: callerFP; headSP: theFP + stackedReceiverOffset. "Mark the new base frame in the new page (FoxCallerContext a.k.a. FoxCallerSavedIP)" stackPages longAt: newFP + FoxCallerContext put: (self frameContext: callerFP). stackPages longAt: newFP + FoxSavedFP put: 0. "Now relocate frame pointers, updating married contexts to refer to their moved spouse frames." fpInNewPage := newPage headFP. [offsetCallerFP := self frameCallerFP: fpInNewPage. offsetCallerFP ~= 0 ifTrue: [offsetCallerFP := offsetCallerFP + delta]. stackPages longAt: fpInNewPage + FoxSavedFP put: (self oopForPointer: offsetCallerFP). (self frameHasContext: fpInNewPage) ifTrue: [theContext := self frameContext: fpInNewPage. objectMemory storePointerUnchecked: SenderIndex ofObject: theContext withValue: (self withSmallIntegerTags: fpInNewPage). objectMemory storePointerUnchecked: InstructionPointerIndex ofObject: theContext withValue: (self withSmallIntegerTags: offsetCallerFP)]. fpInNewPage := offsetCallerFP. fpInNewPage ~= 0] whileTrue. ^newFP! Item was changed: ----- Method: VMPluginCodeGenerator>>preDeclareInterpreterProxyOn: (in category 'C code generator') ----- preDeclareInterpreterProxyOn: aStream "Put the necessary #defines needed before interpreterProxy. Basically internal plugins use the VM's interpreterProxy variable and external plugins use their own. Override to keep local copies of all functions in external prims, and link directly in internal plugins." + "| pcc | + pcc := self new. + (InterpreterProxy selectors reject: [:s| #(initialize private) includes: (InterpreterProxy whichCategoryIncludesSelector: s)]) do: + [:s| pcc noteUsedPluginFunction: s]. + pcc preDeclareInterpreterProxyOn: Transcript. + Transcript flush" | pluginsToClone | (pluginsToClone := self pluginFunctionsToClone) isEmpty ifTrue: [^super preDeclareInterpreterProxyOn: aStream]. aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'; cr. pluginsToClone do: [:selector| | functionName | functionName := self cFunctionNameFor: selector. aStream nextPutAll: ((String streamContents: [:s| (self compileToTMethodSelector: selector in: InterpreterProxy) emitCFunctionPrototype: s generator: self]) copyReplaceAll: functionName with: '(*', functionName, ')'). aStream nextPut: $;; cr]. aStream nextPutAll: '#else /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'; cr. pluginsToClone do: [:selector| aStream nextPutAll: 'extern '. (self compileToTMethodSelector: selector in: InterpreterProxy) static: false; emitCFunctionPrototype: aStream generator: self. aStream nextPut: $;; cr]. aStream cr; nextPutAll: 'extern'. aStream cr; nextPutAll: '#endif'; cr!

1 0

bug leaving Scratch presentation mode with squeak-vm 4.10.2-2614
by Matthew Miller 30 Jan '13

30 Jan '13

Hi! I'm _finally_ getting all the parts in place for Scratch on Fedora Linux. It's all working well, but there's one bug I've noticed: when I exit full-screen presentation mode, I get a blank white window which doesn't respond to anything. I'm launching Scratch like this: squeak -encoding UTF-8 -vm-sound-pulse /usr/share/scratch/Scratch.image with no -xshm or anything else. This uses the scratch plugin from squeak itself, but I'm getting the same behavior when I build the one in the scratch source too. I tried the shift-r trick and turned full screen off; when I return from presentation mode, I still get the unresponsive screen (I thought maybe I could get a squeak menu in that case, but no luck). I asked on the Scratch list, and it was suggested that this was probably a VM problem and that this would be the best place to ask. Anyone have any insight or ideas on how to proceed to debug this? -- Matthew Miller mattdm(a)mattdm.org <http://mattdm.org/>

2 2

VM Maker: Cog-eem.59.mcz
by commits＠source.squeak.org 30 Jan '13

30 Jan '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.59.mcz ==================== Summary ==================== Name: Cog-eem.59 Author: eem Time: 30 January 2013, 10:17:08.461 am UUID: 177b66c7-07e1-44e1-add1-e83d909f3e8f Ancestors: Cog-lw.58 Add support for labelling Newspeak implicit receiver caches. =============== Diff against Cog-lw.58 =============== 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. - [[:size :string| (aSymbolManager labelForPC: address) ifNotNil: [:label| aStream nextPutAll: label; nextPut: $:; cr]. (labelDictionary at: address ifAbsent: []) ifNotNil: + [:label| + label isArray + ifTrue: [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. - [:label| aStream nextPutAll: label; nextPut: $:; cr]. - aStream nextPutAll: (self decorateDisassembly: string for: aSymbolManager fromAddress: address); cr; flush. address := address + size] valueWithArguments: (self primitiveDisassembleAt: address inMemory: memory)]!

1 0

VM Maker: VMMaker.oscog-lw.260.mcz
by commits＠source.squeak.org 30 Jan '13

30 Jan '13

Lars Wassermann uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-lw.260.mcz ==================== Summary ==================== Name: VMMaker.oscog-lw.260 Author: lw Time: 30 January 2013, 9:38:08.186 am UUID: 6ee6c419-5fb3-e34f-ac21-e2051a2076cd Ancestors: VMMaker.oscog-eem.258 reverted all the changes done which were based on the implementation of RTLOpcode Call as (push {pc}, BL) added abstract register LinkReg changed trampolines as suggested on mailinglist added assert in callTargetFromReturnAddress =============== Diff against VMMaker.oscog-eem.258 =============== Item was changed: ----- Method: CogARMCompiler>>callTargetFromReturnAddress: (in category 'inline cacheing') ----- callTargetFromReturnAddress: callSiteReturnAddress "Answer the address the call immediately preceeding callSiteReturnAddress will jump to." | callDistance call | call := self instructionBeforeAddress: callSiteReturnAddress. + self assert: call ~= 0. "andeq r0, r0 will not be generated, not even as nops" (self isBranch: call) ifTrue: [ callDistance := (call bitAnd: 16r00FFFFFF) << 2. "The distance is a signed 24bit number. Therefore, the highest (26th) bit has to be expanded" (callDistance bitAnd: 16r02000000) ~= 0 ifTrue: [callDistance := callDistance bitOr: 16rFC000000]] ifFalse: [ "A Long Jump. Extract the value saved to RISCTempReg from all the instructions before." self notYetImplemented ]. ^callSiteReturnAddress + 4 + callDistance signedIntFromLong! Item was changed: ----- Method: CogARMCompiler>>computeMaximumSize (in category 'generate machine code') ----- computeMaximumSize "Because we don't use Thumb, each ARM instruction has 4 bytes. Some abstract opcodes need more than one instruction." | rotateableAt0then4or20Block | rotateableAt0then4or20Block := [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| maxSize := 4] ifFalse: [maxSize := 20]]. (opcode between: FirstShortJump and: LastJump) ifTrue: [^maxSize := 16]. opcode caseOf: { [Label] -> [^maxSize := 0]. [AlignmentNops] -> [^maxSize := (operands at: 0) - 1]. [MoveAwR] -> [^maxSize := 16]. [MoveCqR] -> [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| maxSize := 4] ifFalse: [maxSize := 16]]. [MoveCwR] -> [^maxSize := 16]. [MoveRAw] -> [^maxSize := 16]. [MoveRMwr] -> [self is12BitValue: (operands at: 1) ifTrue: [ :u :i | ^maxSize := 4] ifFalse: [ ^maxSize := 20 ]]. [MoveRMbr] -> [self is12BitValue: (operands at: 1) ifTrue: [ :u :i | ^maxSize := 4] ifFalse: [ ^maxSize := 20 ]]. [MoveMwrR] -> [self is12BitValue: (operands at: 0) ifTrue: [ :u :i | ^maxSize := 4] ifFalse: [ ^maxSize := 20 ]]. [MoveMbrR] -> [self is12BitValue: (operands at: 0) ifTrue: [ :u :i | ^maxSize := 4] ifFalse: [ ^maxSize := 20 ]]. [PrefetchAw] -> [^maxSize := 16]. + [Call] -> [^maxSize := 20 "recomputed in #sizePCDependentInstruction."]. - [Call] -> [^maxSize := "<="24 "recomputed in #sizePCDependentInstruction."]. [RetN] -> [^(operands at: 0) = 0 ifTrue: [maxSize := 4] ifFalse: [maxSize := 8]]. [CmpCqR] -> [rotateableAt0then4or20Block value]. [AddCqR] -> [rotateableAt0then4or20Block value]. [SubCqR] -> [rotateableAt0then4or20Block value]. [AndCqR] -> [rotateableAt0then4or20Block value]. [OrCqR] -> [rotateableAt0then4or20Block value]. [XorCqR] -> [rotateableAt0then4or20Block value]. [CmpCwR] -> [^maxSize := 20]. [AddCwR] -> [^maxSize := 20]. [SubCwR] -> [^maxSize := 20]. [AndCwR] -> [^maxSize := 20]. [OrCwR] -> [^maxSize := 20]. [XorCwR] -> [^maxSize := 20]. [JumpR] -> [^maxSize := 4]. [JumpFPEqual] -> [^maxSize := 8]. [JumpFPNotEqual] -> [^maxSize := 8]. [JumpFPLess] -> [^maxSize := 8]. [JumpFPGreaterOrEqual]-> [^maxSize := 8]. [JumpFPGreater] -> [^maxSize := 8]. [JumpFPLessOrEqual] -> [^maxSize := 8]. [JumpFPOrdered] -> [^maxSize := 8]. [JumpFPUnordered] -> [^maxSize := 8]. [JumpLong] -> [^maxSize := 16]. [JumpLongZero] -> [^maxSize := 16]. [JumpLongNonZero] -> [^maxSize := 16]. [LoadEffectiveAddressMwrR] -> [rotateableAt0then4or20Block value]. [PushCw] -> [^maxSize := 20]. } otherwise: [^maxSize := 4]. ^4 "to keep C compiler quiet" ! Item was changed: ----- Method: CogARMCompiler>>concreteRegister: (in category 'encoding') ----- concreteRegister: registerIndex "Map a possibly abstract register into a concrete one. Abstract registers (defined in CogAbstractOpcodes) are all negative. If registerIndex is negative assume it is an abstract register." "N.B. According to BSABI, R0-R3 are caller-save, R4-R12 are callee save. Note that R9 might be a special register for the implementation. In some slides it is refered to as sb. R10 can contain the stack limit (sl), R11 the fp. R12 is an intra-procedure scratch instruction pointer for link purposes. It can also be used. R10 is used as temporary inside a single abstract opcode implementation" "R0-R3 are used when calling back to the interpreter. Using them would require saving and restoring their values, so they are omitted so far. R12 is the only unused register at the moment.." ^registerIndex caseOf: { [TempReg] -> [R7]. [ClassReg] -> [R8]. [ReceiverResultReg] -> [R9]. [SendNumArgsReg] -> [R6]. [SPReg] -> [SP]. [FPReg] -> [R11]. [Arg0Reg] -> [R4]. + [Arg1Reg] -> [R5]. + [LinkReg] -> [LR]. } - [Arg1Reg] -> [R5] } otherwise: [self assert: (registerIndex between: R0 and: PC). registerIndex]! Item was changed: ----- Method: CogARMCompiler>>concretizeCall (in category 'generate machine code - concretize') ----- concretizeCall "Will get inlined into concretizeAt: switch." <inline: true> | offset | self assert: (operands at: 0) ~= 0. self assert: (operands at: 0) \\ 4 = 0. + offset := (operands at: 0) signedIntFromLong - (address + 8 "normal pc offset") signedIntFromLong. - offset := (operands at: 0) signedIntFromLong - (address + 8 "normal pc offset" + 4 "push instruction") signedIntFromLong. (self isQuick: offset) ifTrue: [ + self machineCodeAt: 0 put: (self t: 5 o: 8) + (offset >> 2 bitAnd: 16r00FFFFFF). "BL offset" + ^machineCodeSize := 4] - self machineCodeAt: 0 put: (self t: 4 o: 9 s: 0 rn: SP rd: 8 shifterOperand: 0). "push {pc}" - self machineCodeAt: 4 put: (self t: 5 o: 8) + (offset >> 2 bitAnd: 16r00FFFFFF). "BL offset" - ^machineCodeSize := 8] ifFalse: [ self concretizeConditionalJumpLong: AL. "move the actual jump two instructions further, inserting the pc back-up to lr and the pc push." + self machineCodeAt: 16 put: (self machineCodeAt: 12). - self machineCodeAt: 20 put: (self machineCodeAt: 12). "Because the pc always points to the actual address + 8, the value at pc is the address of the instruction after the branch" + "mov lr, pc" + self machineCodeAt: 12 put: (self t: 0 o: 16rD s: 0 rn: 0 rd: LR shifterOperand: PC). + ^machineCodeSize := 20]! - "add lr, pc, #4" - self machineCodeAt: 12 put: (self t: 1 o: 4 s: 0 rn: PC rd: LR shifterOperand: 4). - "self machineCodeAt: 12 put: (self t: 0 o: 16rD s: 0 rn: 0 rd: LR shifterOperand: PC)." - - "push {pc} -- IA32 ABI, needed only for within JIT, when calling outside, like in a trampoline, maybe not." - self machineCodeAt: 16 put: (self new t: 4 o: 9 s: 0 rn: SP rd: 8 shifterOperand: 0). - ^machineCodeSize := 24]! Item was changed: ----- Method: CogARMCompiler>>isCallPreceedingReturnPC: (in category 'testing') ----- isCallPreceedingReturnPC: mcpc "Assuming mcpc is a return pc answer if the instruction before it is a call." + "There are two types of calls: BL and (MOV, ORR, ORR, ADD, ADD)" - "There are two types of calls: PUSH, BL and (MOV, ORR, ORR, ADD, PUSH, ADD)" "PUSH {pc} is not sufficient as a test, because pc may be pushed using the PushR opcode" + ^ (objectMemory byteAt: mcpc - 3) >> 4 = 16rB "BL" + or: [ (objectMemory longAt: mcpc - 4) >> 12 = ((self t: 1 o: 4 s: 0 rn: RISCTempReg rd: PC)"add pc, r3, 0" >> 12) ]! - ^(objectMemory longAt: mcpc - 8) = (self t: 4 o: 9 s: 0 rn: SP rd: 8 shifterOperand: 0) - and: [(objectMemory byteAt: mcpc - 3) >> 4 = 16rB "BL" - or: [ (objectMemory longAt: mcpc - 12) = 16rE1A0E00F "MOV pc, lr" ]]! Item was changed: ----- Method: CogARMCompiler>>sizePCDependentInstructionAt: (in category 'generate machine code') ----- sizePCDependentInstructionAt: eventualAbsoluteAddress "Size a jump and set its address. The target may be another instruction or an absolute address. On entry the address inst var holds our virtual address. On exit address is set to eventualAbsoluteAddress, which is where this instruction will be output. The span of a jump to a following instruction is therefore between that instruction's address and this instruction's address ((which are both still their virtual addresses), but the span of a jump to a preceeding instruction or to an absolute address is between that instruction's address (which by now is its eventual absolute address) or absolute address and eventualAbsoluteAddress." | target maximumSpan | <var: #abstractInstruction type: #'AbstractInstruction *'> opcode = AlignmentNops ifTrue: [| alignment | address := eventualAbsoluteAddress. alignment := operands at: 0. ^machineCodeSize := (eventualAbsoluteAddress + (alignment - 1) bitAnd: alignment negated) - eventualAbsoluteAddress]. self assert: (self isJump or: [opcode = Call]). self isJump ifTrue: [self resolveJumpTarget]. target := operands at: 0. "maximumSpan calculation copied from CogIA32Compiler TODO: extract method?" (self isAnInstruction: (cogit cCoerceSimple: target to: #'void *')) ifTrue: [| abstractInstruction | abstractInstruction := cogit cCoerceSimple: target to: #'AbstractInstruction *'. maximumSpan := abstractInstruction address - (((cogit abstractInstruction: self follows: abstractInstruction) ifTrue: [eventualAbsoluteAddress] ifFalse: [address]) + 2)] ifFalse: [maximumSpan := target - (eventualAbsoluteAddress + 2)]. address := eventualAbsoluteAddress. ^machineCodeSize := opcode = Call + ifTrue: [(self isQuick: maximumSpan) ifTrue: [4] ifFalse: [20]] - ifTrue: [(self isQuick: maximumSpan - 4 "push instruction") ifTrue: [8] ifFalse: [24]] ifFalse: [(self isLongJump not and: [self isQuick: maximumSpan]) ifTrue: [4] ifFalse: [16]] "load address to register, add"! Item was changed: ----- Method: CogARMCompilerTests>>strip: (in category 'accessing') ----- strip: aFancyDisassembledInstruction "When havin an immediate > 15, the disassembler appends ' ; 0x\d\d'. That is stripped." + ^((aFancyDisassembledInstruction + allButFirst: (aFancyDisassembledInstruction indexOf: $:) + 1) + copyUpTo: $;) withBlanksTrimmed! - ^(aFancyDisassembledInstruction copyUpTo: $;) withBlanksTrimmed! Item was changed: SharedPool subclass: #CogRTLOpcodes instanceVariableNames: '' + classVariableNames: 'AddCqR AddCwR AddRR AddRdRd AlignmentNops AndCqR AndCwR AndRR Arg0Reg Arg1Reg ArithmeticShiftRightCqR ArithmeticShiftRightRR Call ClassReg CmpCqR CmpCwR CmpRR CmpRdRd ConvertRRd DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 DivRdRd FPReg Fill16 Fill32 Fill8 FillBytesFrom FillFromWord FirstJump FirstShortJump GPRegMax GPRegMin Jump JumpAbove JumpAboveOrEqual JumpBelow JumpBelowOrEqual JumpCarry JumpFPEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPLess JumpFPLessOrEqual JumpFPNotEqual JumpFPOrdered JumpFPUnordered JumpGreater JumpGreaterOrEqual JumpLess JumpLessOrEqual JumpLong JumpLongNonZero JumpLongZero JumpNegative JumpNoCarry JumpNoOverflow JumpNonNegative JumpNonZero JumpOverflow JumpR JumpZero Label LastJump LastRTLCode LinkReg LoadEffectiveAddressMwrR LogicalShiftLeftCqR LogicalShiftLeftRR LogicalShiftRightCqR LogicalShiftRightRR MoveAbR MoveAwR MoveC32R MoveC64R MoveCqR MoveCwR MoveM16rR MoveM64rRd MoveMbrR MoveMwrR MoveRAw MoveRM16r MoveRMbr MoveRMwr MoveRR MoveRX16rR MoveRXbrR MoveRXwrR MoveRdM64r MoveRdRd MoveX16rRR MoveXbrRR MoveXwrRR MulCqR MulCwR MulRR MulRdRd NegateR Nop OrCqR OrCwR OrRR PopR PrefetchAw PushCw PushR ReceiverResultReg RetN SPReg SendNumArgsReg SqrtRd SubCqR SubCwR SubRR SubRdRd TempReg XorCqR XorCwR XorRR' - classVariableNames: 'AddCqR AddCwR AddRR AddRdRd AlignmentNops AndCqR AndCwR AndRR Arg0Reg Arg1Reg ArithmeticShiftRightCqR ArithmeticShiftRightRR Call ClassReg CmpCqR CmpCwR CmpRR CmpRdRd ConvertRRd DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 DivRdRd FPReg Fill16 Fill32 Fill8 FillBytesFrom FillFromWord FirstJump FirstShortJump GPRegMax GPRegMin Jump JumpAbove JumpAboveOrEqual JumpBelow JumpBelowOrEqual JumpCarry JumpFPEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPLess JumpFPLessOrEqual JumpFPNotEqual JumpFPOrdered JumpFPUnordered JumpGreater JumpGreaterOrEqual JumpLess JumpLessOrEqual JumpLong JumpLongNonZero JumpLongZero JumpNegative JumpNoCarry JumpNoOverflow JumpNonNegative JumpNonZero JumpOverflow JumpR JumpZero Label LastJump LastRTLCode LoadEffectiveAddressMwrR LogicalShiftLeftCqR LogicalShiftLeftRR LogicalShiftRightCqR LogicalShiftRightRR MoveAbR MoveAwR MoveC32R MoveC64R MoveCqR MoveCwR MoveM16rR MoveM64rRd MoveMbrR MoveMwrR MoveRAw MoveRM16r MoveRMbr MoveRMwr MoveRR MoveRX16rR MoveRXbrR MoveRXwrR MoveRdM64r MoveRdRd MoveX16rRR MoveXbrRR MoveXwrRR MulCqR MulCwR MulRR MulRdRd NegateR Nop OrCqR OrCwR OrRR PopR PrefetchAw PushCw PushR ReceiverResultReg RetN SPReg SendNumArgsReg SqrtRd SubCqR SubCwR SubRR SubRdRd TempReg XorCqR XorCwR XorRR' poolDictionaries: '' category: 'VMMaker-JIT'! !CogRTLOpcodes commentStamp: '<historical>' prior: 0! I am a pool for the Register-Transfer-Language to which Cog compiles. I define unique integer values for all RTL opcodes and abstract registers. See CogAbstractInstruction for instances of instructions with the opcodes that I define.! Item was changed: ----- Method: CogRTLOpcodes class>>initialize (in category 'class initialization') ----- initialize "Abstract opcodes are a compound of a one word operation specifier and zero or more operand type specifiers. e.g. MoveRR is the Move opcode with two register operand specifiers and defines a move register to register instruction from operand 0 to operand 1. The operand specifiers are R - general purpose register Rd - double-precision floating-point register Cq - a quick constant that can be encoded in the minimum space possible. Cw - a constant with word size where word is the default operand size for the Smalltalk VM, 32-bits for a 32-bit VM, 64-bits for a 64-bit VM. The generated constant must occupy the default number of bits. This allows e.g. a garbage collector to update the value without invalidating the code. C32 - a constant with 32 bit size. The generated constant must occupy 32 bits. C64 - a constant with 64 bit size. The generated constant must occupy 64 bits. Aw - memory word with an absolute address Ab - memory byte with an absolute address Mwr - memory word whose address is at a constant offset from an address in a register Mbr - memory byte whose address is at a constant offset from an address in a register M16r - memory 16-bit halfword whose address is at a constant offset from an address in a register M64r - memory 64-bit doubleword whose address is at a constant offset from an address in a register XbrR- memory word whose address is r * byte size away from an address in a register X16rR- memory word whose address is r * (2 bytes size) away from an address in a register XwrR- memory word whose address is r * word size away from an address in a register An alternative would be to decouple opcodes from operands, e.g. Move := 1. Add := 2. Sub := 3... RegisterOperand := 1. ConstantQuickOperand := 2. ConstantWordOperand := 3... But not all combinations make sense and even fewer are used so we stick with the simple compound approach. The assumption is that comparison and arithmetic instructions set condition codes and that move instrucions leave the condition codes unaffected. In particular LoadEffectiveAddressMwrR does not set condition codes although it can be used to do arithmetic. Note that there are no generic division instructions defined, but a processor may define some." "CogRTLOpcodes initialize. CogAbstractInstruction allSubclasses do: [:sc| sc initialize]" | opcodeNames refs | FPReg := -1. SPReg := -2. ReceiverResultReg := GPRegMax := -3. TempReg := -4. ClassReg := -5. SendNumArgsReg := -6. Arg0Reg := -7. Arg1Reg := GPRegMin := -8. DPFPReg0 := -9. DPFPReg1 := -10. DPFPReg2 := -11. DPFPReg3 := -12. DPFPReg4 := -13. DPFPReg5 := -14. DPFPReg6 := -15. DPFPReg7 := -16. + + LinkReg := -17. opcodeNames := #("Noops & Pseudo Ops" Label AlignmentNops FillBytesFrom "output operand 0's worth of bytes from the address in operand 1" Fill8 "output a byte's worth of bytes with operand 0" Fill16 "output two byte's worth of bytes with operand 0" Fill32 "output four byte's worth of bytes with operand 0" FillFromWord "output BytesPerWord's worth of bytes with operand 0 + operand 1" Nop "Control" Call RetN JumpR "Not a regular jump, i.e. not pc dependent." "N.B. Jumps are contiguous. Long jumps are contigiuous within them. See FirstJump et al below" JumpLong JumpLongZero "a.k.a. JumpLongEqual" JumpLongNonZero "a.k.a. JumpLongNotEqual" Jump JumpZero "a.k.a. JumpEqual" JumpNonZero "a.k.a. JumpNotEqual" JumpNegative JumpNonNegative JumpOverflow JumpNoOverflow JumpCarry JumpNoCarry JumpLess "signed" JumpGreaterOrEqual JumpGreater JumpLessOrEqual JumpBelow "unsigned" JumpAboveOrEqual JumpAbove JumpBelowOrEqual JumpFPEqual JumpFPNotEqual JumpFPLess JumpFPLessOrEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPOrdered JumpFPUnordered "Data Movement; destination is always last operand" MoveRR MoveAwR MoveRAw MoveAbR MoveMwrR MoveRMwr MoveXwrRR MoveRXwrR MoveM16rR MoveRM16r MoveX16rRR MoveRX16rR MoveMbrR MoveRMbr MoveXbrRR MoveRXbrR MoveCqR MoveCwR MoveC32R MoveC64R MoveRdRd MoveM64rRd MoveRdM64r PopR PushR PushCw PrefetchAw "Arithmetic; destination is always last operand except Cmp; CmpXR is SubRX with no update of result" LoadEffectiveAddressMwrR "A variant of add" NegateR "2's complement negation" ArithmeticShiftRightCqR ArithmeticShiftRightRR LogicalShiftRightCqR LogicalShiftRightRR LogicalShiftLeftCqR LogicalShiftLeftRR CmpRR AddRR SubRR AndRR OrRR XorRR MulRR CmpCqR AddCqR SubCqR AndCqR OrCqR XorCqR MulCqR CmpCwR AddCwR SubCwR AndCwR OrCwR XorCwR MulCwR CmpRdRd AddRdRd SubRdRd MulRdRd DivRdRd SqrtRd "Conversion" ConvertRRd LastRTLCode). refs := (thisContext method literals select: [:l| l isVariableBinding and: [classPool includesKey: l key]]) collect: [:ea| ea key]. (classPool keys reject: [:k| (opcodeNames includes: k) or: [refs includes: k]]) do: [:k| Undeclared declare: k from: classPool]. opcodeNames withIndexDo: [:classVarName :value| self classPool declare: classVarName from: Undeclared; at: classVarName put: value]. FirstJump := JumpLong. LastJump := JumpFPUnordered. FirstShortJump := Jump! Item was changed: ----- Method: CogRTLOpcodes class>>nameForAbstractRegister: (in category 'debug printing') ----- nameForAbstractRegister: reg "<Integer>" ^#(Arg0Reg Arg1Reg ClassReg FPReg ReceiverResultReg SPReg SendNumArgsReg TempReg + DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 LinkReg) - DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7) detect: [:sym| (classPool at: sym) = reg]! Item was changed: ----- Method: CogRTLOpcodes class>>nameForRegister: (in category 'debug printing') ----- nameForRegister: reg "<Integer>" ^#(Arg0Reg Arg1Reg ClassReg FPReg ReceiverResultReg SPReg SendNumArgsReg TempReg + DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 LinkReg) - DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7) detect: [:sym| (classPool at: sym) = reg]! Item was changed: ----- Method: Cogit>>compileAbort (in category 'compile abstract instructions') ----- compileAbort "The start of a CogMethod has a call to a run-time abort routine that either handles an in-line cache failure or a stack overflow. The routine selects the path depending on ReceiverResultReg; if zero it takes the stack overflow path; if nonzero the in-line cache miss path. Neither of these paths returns. The abort routine must be called; In the callee the method is located by adding the relevant offset to the return address of the call." stackOverflowCall := self MoveCq: 0 R: ReceiverResultReg. + backEnd hasLinkRegister ifTrue: + [self PushR: LinkReg]. sendMissCall := self Call: (self methodAbortTrampolineFor: methodOrBlockNumArgs)! Item was changed: ----- Method: Cogit>>compileTrampolineFor:callJumpBar:numArgs:arg:arg:arg:arg:saveRegs:resultReg: (in category 'initialization') ----- compileTrampolineFor: aRoutine callJumpBar: callJumpBar "<Boolean>" numArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 saveRegs: saveRegs resultReg: resultRegOrNil "Generate a trampoline with up to four arguments. Generate either a call or a jump to aRoutine as requested by callJumpBar. If generating a call and resultRegOrNil is non-zero pass the C result back in resultRegOrNil. Hack: a negative value indicates an abstract register, a non-negative value indicates a constant." <var: #aRoutine type: #'void *'> <inline: false> self genSaveStackPointers. self genLoadCStackPointers. cStackAlignment > BytesPerWord ifTrue: [backEnd genAlignCStackSavingRegisters: saveRegs numArgs: numArgs wordAlignment: cStackAlignment / BytesPerWord]. saveRegs ifTrue: [callJumpBar ifFalse: [self error: 'why save registers when you''re not going to return?']. backEnd genSaveRegisters]. numArgs > 0 ifTrue: [numArgs > 1 ifTrue: [numArgs > 2 ifTrue: [numArgs > 3 ifTrue: [regOrConst3 < 0 ifTrue: [backEnd genPassReg: regOrConst3 asArgument: 3] ifFalse: [backEnd genPassConst: regOrConst3 asArgument: 3]]. regOrConst2 < 0 ifTrue: [backEnd genPassReg: regOrConst2 asArgument: 2] ifFalse: [backEnd genPassConst: regOrConst2 asArgument: 2]]. regOrConst1 < 0 ifTrue: [backEnd genPassReg: regOrConst1 asArgument: 1] ifFalse: [backEnd genPassConst: regOrConst1 asArgument: 1]]. regOrConst0 < 0 ifTrue: [backEnd genPassReg: regOrConst0 asArgument: 0] ifFalse: [backEnd genPassConst: regOrConst0 asArgument: 0]]. + backEnd hasLinkRegister + ifTrue: [self gen: PushR operand: LinkReg]. self gen: (callJumpBar ifTrue: [Call] ifFalse: [Jump]) operand: (self cCode: [aRoutine asUnsignedInteger] inSmalltalk: [self simulatedTrampolineFor: aRoutine]). callJumpBar ifTrue: [resultRegOrNil ifNotNil: [backEnd genWriteCResultIntoReg: resultRegOrNil]. saveRegs ifTrue: [numArgs > 0 ifTrue: [backEnd genRemoveNArgsFromStack: numArgs]. resultRegOrNil ifNotNil: [backEnd genRestoreRegsExcept: resultRegOrNil] ifNil: [backEnd genRestoreRegs]]. self genLoadStackPointers. self RetN: 0]! Item was changed: ----- Method: Cogit>>genMethodAbortTrampoline (in category 'initialization') ----- genMethodAbortTrampoline "Generate the abort for a method. This abort performs either a call of ceSICMiss: to handle a single-in-line cache miss or a call of ceStackOverflow: to handle a stack overflow. It distinguishes the two by testing ResultReceiverReg. If the register is zero then this is a stack-overflow because a) the receiver has already been pushed and so can be set to zero before calling the abort, and b) the receiver must always contain an object (and hence be non-zero) on SIC miss." | jumpSICMiss | <var: #jumpSICMiss type: #'AbstractInstruction *'> opcodeIndex := 0. self CmpCq: 0 R: ReceiverResultReg. jumpSICMiss := self JumpNonZero: 0. + backEnd hasLinkRegister + ifTrue: [self MoveR: LinkReg Mw: 0 r: SPReg]. "overwrite send ret address with ceMethodAbortTrampoline call ret address" self compileTrampolineFor: #ceStackOverflow: callJumpBar: true numArgs: 1 arg: SendNumArgsReg arg: nil arg: nil arg: nil saveRegs: false resultReg: nil. jumpSICMiss jmpTarget: self Label. + backEnd hasLinkRegister + ifTrue: [self PushR: LinkReg]. "push ret address for ceMethodAbortTrampoline call" ^self genTrampolineFor: #ceSICMiss: called: 'ceMethodAbort' callJumpBar: true numArgs: 1 arg: ReceiverResultReg arg: nil arg: nil arg: nil saveRegs: false resultReg: nil appendOpcodes: true! Item was changed: ----- Method: VMMaker class>>generateSqueakCogVM (in category 'configurations') ----- generateSqueakCogVM ^VMMaker generate: (Smalltalk at: ([:choices| choices at: (UIManager default chooseFrom: choices) ifAbsent: [^self]] value: #(CoInterpreter CoInterpreterMT))) and: StackToRegisterMappingCogit with: #( MULTIPLEBYTECODESETS false NewspeakVM false) to: (FileDirectory default pathFromURI: 'oscogvm/src') platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including:#( ADPCMCodecPlugin AsynchFilePlugin BalloonEnginePlugin B3DAcceleratorPlugin + BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin CroquetPlugin DSAPlugin - BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin GdbARMPlugin CroquetPlugin DSAPlugin DeflatePlugin DropPlugin FT2Plugin FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin GeniePlugin HostWindowPlugin IA32ABIPlugin InternetConfigPlugin JPEGReadWriter2Plugin JPEGReaderPlugin JoystickTabletPlugin KlattSynthesizerPlugin LargeIntegersPlugin LocalePlugin MIDIPlugin MacMenubarPlugin Matrix2x3Plugin MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin SecurityPlugin SerialPlugin SocketPlugin SoundCodecPlugin SoundGenerationPlugin SoundPlugin ThreadedIA32FFIPlugin StarSqueakPlugin UUIDPlugin UnixOSProcessPlugin Win32OSProcessPlugin VMProfileMacSupportPlugin)!

1 0

VM Maker: Cog-lw.58.mcz
by commits＠source.squeak.org 30 Jan '13

30 Jan '13

Lars Wassermann uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-lw.58.mcz ==================== Summary ==================== Name: Cog-lw.58 Author: lw Time: 30 January 2013, 9:34:28.956 am UUID: c6b730fe-47ba-da41-ab07-5de7090d4064 Ancestors: Cog-lw.56, Cog-IgorStasenko.57 changed the disassemble string generated by the plugin (added address) and subsequently had to change back decoration and some tests added some abi information, e.g. cResultReg =============== Diff against Cog-IgorStasenko.57 =============== Item was added: + ----- Method: CogProcessorAlien>>cResultRegister (in category 'accessing-abstract') ----- + cResultRegister + ^self subclassResponsibility! Item was added: + ----- Method: CogProcessorAlien>>cResultRegister: (in category 'accessing-abstract') ----- + cResultRegister: aValue + ^self subclassResponsibility! Item was changed: ----- Method: CogProcessorAlien>>disassembleNextInstructionIn:for: (in category 'disassembly') ----- disassembleNextInstructionIn: memory for: aSymbolManager "<Cogit|nil>" | string | + string := self pc < memory size + ifTrue: [(self primitiveDisassembleAt: self pc inMemory: memory) last.] + ifFalse: ['Invalid address (', (self pc hex allButFirst: 3), ')']. - string := (self primitiveDisassembleAt: self pc inMemory: memory) last. ^aSymbolManager ifNil: [string] ifNotNil: [self decorateDisassembly: string for: aSymbolManager]! Item was added: + ----- Method: CogProcessorAlien>>registerStatePCIndex (in category 'accessing-abstract') ----- + registerStatePCIndex + "Return the index of the PC register among all register, assuming they are copied into a Smalltalk array." + ^self subclassResponsibility! Item was added: + ----- Method: GdbARMAlien>>cResultRegister (in category 'accessing-abstract') ----- + cResultRegister + self r0! Item was added: + ----- Method: GdbARMAlien>>cResultRegister: (in category 'accessing-abstract') ----- + cResultRegister: aValue + self r0: aValue! Item was changed: ----- Method: GdbARMAlien>>decorateDisassembly:for:fromAddress: (in category 'disassembly') ----- decorateDisassembly: anInstructionString for: aSymbolManager "<Cogit>" fromAddress: address + (anInstructionString endsWith: 'mov r1, r1') + ifTrue: [^super decorateDisassembly: 'nop' for: aSymbolManager]. + ^super decorateDisassembly: anInstructionString for: aSymbolManager! - "Prepend the address to the decoration string." - | addressPrefix | - addressPrefix := ((address storeStringBase: 16 length: 9 padded: true) allButFirst: 3), ' ', String tab. - anInstructionString = 'mov r1, r1' - ifTrue: [^super decorateDisassembly: addressPrefix, 'nop' for: aSymbolManager]. - ^super decorateDisassembly: addressPrefix, anInstructionString for: aSymbolManager! Item was changed: ----- Method: GdbARMAlien>>printRegisterState:on: (in category 'printing') ----- printRegisterState: registerStateVector on: aStream | rsvs fields| aStream ensureCr. rsvs := registerStateVector readStream. + fields := #( r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 sp lr pc eflags cr). - fields := #( r0 r1 r2 r3 r4 r5 r6 cr r7 r8 r9 r10 r11 r12 cr sp lr pc eflags cr). fields withIndexDo: [:sym :index| | val | sym = #cr ifTrue: [aStream cr] ifFalse: [(val := rsvs next) isNil ifTrue: [^self]. aStream nextPutAll: sym; nextPut: $:; space. val printOn: aStream base: 16 length: 8 padded: true. #eflags == sym ifTrue: [aStream space. "'FIVCZN'"'--VCZN' withIndexDo: [:flag :bitIndex| flag ~= $- ifTrue: [aStream nextPut: flag; nextPutAll: 'F='; print: (val bitAnd: 1 << (bitIndex - 1)) >> (bitIndex - 1); space]]] ifFalse: [val > 16 ifTrue: [aStream space; nextPut: $(. val printOn: aStream base: 10 length: 1 padded: false. aStream nextPut: $)]]. (fields at: index + 1) ~~ #cr ifTrue: [aStream tab]]]! Item was added: + ----- Method: GdbARMAlien>>registerStatePCIndex (in category 'accessing-abstract') ----- + registerStatePCIndex + ^16! Item was changed: ----- Method: GdbARMAlien>>smashRegisterAccessors (in category 'accessing-abstract') ----- smashRegisterAccessors + ^#(r0: r1: r2: r3: r4: r5: r6: r7: r8: r9: r10:)! - ^#(r0: r1: r2: r3: r4: r5: r6: r7: r8:)! Item was changed: ----- Method: GdbARMAlienTests>>testCallTrap (in category 'tests') ----- testCallTrap "Call a function that is out-of-range. Ensure the call is trapped." "self new testCallTrap" | memory | memory := Bitmap new: 256 withAll: self processor nopOpcode. + memory longAt: 5 put: (self processor branchAndLinkOpcodeWithOffset: 1020) bigEndian: false. - memory longAt: 1 put: (self processor branchAndLinkOpcodeWithOffset: 1024) bigEndian: false. memory := memory asByteArray. self processor + pc: 4; - pc: 0; sp: (memory size - 4); "Room for return address" singleStepIn: memory. "We have to step twice, because the first step only changes the pc, but does not fetch anything from the address it points to." self should: [self processor singleStepIn: memory] + raise: ProcessorSimulationTrap - raise: Error withExceptionDo: [:pst| self assert: self processor pc = 1024. + self assert: self processor lr = 8. + self assert: pst pc = 4. + self assert: pst nextpc = 8. - self assert: self processor lr = 4. - self assert: pst pc = 0. - self assert: pst nextpc = 4. self assert: pst address = 1024. self assert: pst type = #call].! Item was changed: ----- Method: GdbARMAlienTests>>testDisassembling (in category 'tests') ----- testDisassembling | memory result | memory := WordArray new: 2. memory at: 1 put: 16rEF200000. result := self processor disassembleInstructionAt: 0 In: memory into: [:str :len | self assert: len = 4; + assert: str = '0x00000000: svc 0x00200000'].! - assert: str = 'svc 0x00200000'].! Item was changed: ----- Method: GdbARMAlienTests>>testFlags (in category 'tests') ----- testFlags "self new testFlags" | memory | memory := Bitmap new: 3. memory longAt: 1 put: 16rE3A03001 bigEndian: false. "MOV r3, #1" memory longAt: 5 put: 16rE3530001 bigEndian: false. "CMP r3, #1" memory := memory asByteArray. self processor disassembleInstructionAt: 0 In: memory into: [:str :len | self assert: len = 4; + assert: str equals: '0x00000000: mov r3, #1']. - assert: str = 'mov r3, #1']. self processor disassembleInstructionAt: 4 In: memory into: [:str :len | self assert: len = 4; + assert: str equals: '0x00000004: cmp r3, #1']. - assert: str = 'cmp r3, #1']. self processor pc: 0; singleStepIn: memory; singleStepIn: memory. self assert: self processor pc = 16r8; assert: self processor r3 = 1; assert: self processor zflag = 1; assert: self processor cflag = 1; assert: self processor vflag = 0; assert: self processor nflag = 0. self processor reset. self assert: self processor eflags = 3. "IFFlags are both set."!

1 0

← Newer
1
2
3
4
5
6
7
...
15
Older →

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