Vm-dev January 2013

vm-dev@lists.squeakfoundation.org

27 participants
148 discussions

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

03 Jan '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.248.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.248 Author: eem Time: 3 January 2013, 1:48:51.874 pm UUID: 325b96ad-3c25-438e-af36-04a93839f195 Ancestors: VMMaker.oscog-eem.247 Fix snafu in revised build info generation. =============== Diff against VMMaker.oscog-eem.247 =============== Item was changed: ----- Method: CCodeGenerator>>fileHeaderVersionStampForSourceClass: (in category 'C code generator') ----- fileHeaderVersionStampForSourceClass: sourceClass "Answer a suitable version stamp to include in the header." | exportBuildInfo slangDescription sourceDescription | [exportBuildInfo := sourceClass isInterpreterClass ifTrue: ['char *__interpBuildInfo = __buildInfo;'] ifFalse: [sourceClass isCogitClass ifTrue: ['char *__cogitBuildInfo = __buildInfo;'] ifFalse: [sourceClass isPluginClass ifTrue: [sourceClass exportBuildInfoOrNil]]]] on: MessageNotUnderstood do: [:ex| ex resume: false]. [slangDescription := self class monticelloDescriptionFor: self class. sourceClass ifNotNil: [sourceDescription := [sourceClass monticelloDescription] on: MessageNotUnderstood do: [:ex| self class monticelloDescriptionFor: sourceClass]]] on: Error do: [:ex| | now | now := Time dateAndTimeNow printString. ^String streamContents: [:s| s nextPutAll: '/* Automatically generated from Squeak on '. s nextPutAll: now. s nextPutAll: ' */'; cr; cr. s nextPutAll: 'static char __buildInfo[] = "Generated on '. s nextPutAll: now. s nextPutAll: '. Compiled on "'. s nextPutAll: '__DATE__ ;'; cr. exportBuildInfo ifNotNil: [s nextPutAll: exportBuildInfo; cr]. s cr]]. ^String streamContents: [:s| s nextPutAll: '/* Automatically generated by\ ' withCRs. + s nextPutAll: slangDescription. - s nextPutAll: (slangDescription copyReplaceAll: '\' withCRs with: '\ ' withCRs).. sourceDescription ifNotNil: + [s nextPutAll: '\ from\ ' withCRs; nextPutAll: (sourceDescription copyReplaceAll: '\' withCRs with: '\ ' withCRs)]. - [s nextPutAll: '\ from\ ' withCRs; nextPutAll: sourceDescription]. s cr; nextPutAll: ' */'; cr. sourceDescription ifNotNil: [s nextPutAll: 'static char __buildInfo[] = "'. + s nextPutAll: (sourceDescription copyReplaceAll: '\' withCRs with: '\n\', '\' withCRs). - s nextPutAll: sourceDescription. s nextPutAll: ' " __DATE__ ;'; cr. exportBuildInfo ifNotNil: [s nextPutAll: exportBuildInfo; cr]. s cr]]!

1 0

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

03 Jan '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.247.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.247 Author: eem Time: 3 January 2013, 1:34:32.442 pm UUID: 16558e1b-de42-458d-a01d-6f2230d165b7 Ancestors: VMMaker.oscog-eem.246 Integrate directed shift changes from cog issue 111 that affect the CoInterpreter and Cogit. Refactor Monticello build info so that plugin classes can override. Make the trnalsated primitive plugins include info from their primitive supplying classes. =============== Diff against VMMaker.oscog-eem.246 =============== Item was added: + ----- Method: ADPCMCodecPlugin class>>monticelloDescription (in category 'translation') ----- + monticelloDescription + "Override to include the ADPCMCodec class." + "self monticelloDescription" + ^super monticelloDescription, '\' withCRs, (CCodeGenerator monticelloDescriptionFor: ADPCMCodec)! Item was added: + ----- Method: CCodeGenerator class>>monticelloDescriptionFor: (in category 'C code generator') ----- + monticelloDescriptionFor: aClass + "Answer a suitable Monticello package stamp to include in the header." + | pkgInfo pkg uuid | + pkgInfo := PackageOrganizer default packageOfClass: aClass. + pkg := MCWorkingCopy allManagers detect: [:ea| ea packageName = pkgInfo packageName]. + pkg ancestry ancestors isEmpty ifFalse: + [uuid := pkg ancestry ancestors first id]. + ^aClass name, (pkg modified ifTrue: [' * '] ifFalse: [' ']), pkg ancestry ancestorString, ' uuid: ', uuid asString! Item was changed: ----- Method: CCodeGenerator>>fileHeaderVersionStampForSourceClass: (in category 'C code generator') ----- fileHeaderVersionStampForSourceClass: sourceClass + "Answer a suitable version stamp to include in the header." - "Answer a suitable versiomn stamp to include in the header." | exportBuildInfo slangDescription sourceDescription | [exportBuildInfo := sourceClass isInterpreterClass ifTrue: ['char *__interpBuildInfo = __buildInfo;'] ifFalse: [sourceClass isCogitClass ifTrue: ['char *__cogitBuildInfo = __buildInfo;'] ifFalse: [sourceClass isPluginClass ifTrue: [sourceClass exportBuildInfoOrNil]]]] on: MessageNotUnderstood do: [:ex| ex resume: false]. + [slangDescription := self class monticelloDescriptionFor: self class. - [slangDescription := self monticelloDescriptionFor: self class. sourceClass ifNotNil: + [sourceDescription := [sourceClass monticelloDescription] + on: MessageNotUnderstood + do: [:ex| self class monticelloDescriptionFor: sourceClass]]] - [sourceDescription := self monticelloDescriptionFor: sourceClass]] on: Error do: [:ex| | now | now := Time dateAndTimeNow printString. ^String streamContents: [:s| s nextPutAll: '/* Automatically generated from Squeak on '. s nextPutAll: now. s nextPutAll: ' */'; cr; cr. s nextPutAll: 'static char __buildInfo[] = "Generated on '. s nextPutAll: now. s nextPutAll: '. Compiled on "'. s nextPutAll: '__DATE__ ;'; cr. exportBuildInfo ifNotNil: [s nextPutAll: exportBuildInfo; cr]. s cr]]. ^String streamContents: [:s| + s nextPutAll: '/* Automatically generated by\ ' withCRs. + s nextPutAll: (slangDescription copyReplaceAll: '\' withCRs with: '\ ' withCRs).. - s nextPutAll: '/* Automatically generated by'. - s crtab. - s nextPutAll: slangDescription. sourceDescription ifNotNil: + [s nextPutAll: '\ from\ ' withCRs; nextPutAll: sourceDescription]. - [s cr; nextPutAll: ' from'; crtab; nextPutAll: sourceDescription]. s cr; nextPutAll: ' */'; cr. sourceDescription ifNotNil: [s nextPutAll: 'static char __buildInfo[] = "'. s nextPutAll: sourceDescription. s nextPutAll: ' " __DATE__ ;'; cr. exportBuildInfo ifNotNil: [s nextPutAll: exportBuildInfo; cr]. s cr]]! Item was removed: - ----- Method: CCodeGenerator>>monticelloDescriptionFor: (in category 'C code generator') ----- - monticelloDescriptionFor: aClass - "Answer a suitable Monticello package stamp to include in the header." - | pkgInfo pkg uuid | - pkgInfo := PackageOrganizer default packageOfClass: aClass. - pkg := MCWorkingCopy allManagers detect: [:ea| ea packageName = pkgInfo packageName]. - pkg ancestry ancestors isEmpty ifFalse: - [uuid := pkg ancestry ancestors first id]. - ^aClass name, (pkg modified ifTrue: [' * '] ifFalse: [' ']), pkg ancestry ancestorString, ' uuid: ', uuid asString! Item was changed: ----- Method: CCodeGenerator>>needToGenerateHeader:file:contents: (in category 'C code generator') ----- needToGenerateHeader: headerName file: interpHdrPath contents: newContentsArg "Check if we need to regenerate a header file. We always need to if the contents have changed. But if not we can avoid needless recompilations by not regenerating. So only regenerate if the package is clean (version doesn't include a '*'). If we can't find a package version ask the user." | newContents oldContents | (FileDirectory default fileExists: interpHdrPath) ifFalse: [^true]. newContents := newContentsArg. oldContents := (FileDirectory default oldFileNamed: interpHdrPath) contentsOfEntireFile. (newContents beginsWith: '/*') = (oldContents beginsWith: '/*') ifFalse: [(newContents beginsWith: '/*') ifTrue: [newContents := newContents readStream upToAll: '*/'; skipSeparators; upToEnd]. (oldContents beginsWith: '/*') ifTrue: [oldContents := oldContents readStream upToAll: '*/'; skipSeparators; upToEnd]]. oldContents := oldContents copyReplaceAll: {Character cr. Character lf} with: {Character cr}. oldContents replaceAll: Character lf with: Character cr. ^oldContents ~= newContents + or: [[((self class monticelloDescriptionFor: vmClass) includes: $*) not] - or: [[((self monticelloDescriptionFor: vmClass) includes: $*) not] on: Error do: [:ex| self confirm: headerName, ' contents are unchanged.\Writing the file may cause recompilation of support files.\Do you want to write the header file?\The interpreter will still be written either way.' withCRs]]! Item was changed: ----- Method: CCodeGenerator>>shortMonticelloDescriptionForClass: (in category 'C code generator') ----- shortMonticelloDescriptionForClass: aClass "Answer a suitable Monticello package stamp to include in a moduleName." | mdesc | + mdesc := [self class monticelloDescriptionFor: aClass] - mdesc := [self monticelloDescriptionFor: aClass] on: Error do: [:ex| ^' ', Date today asString]. ^mdesc copyFrom: 1 to: (mdesc indexOfSubCollection: ' uuid:') - 1! Item was changed: ----- Method: CoInterpreter>>ifBackwardsCheckForEvents: (in category 'jump bytecodes') ----- ifBackwardsCheckForEvents: offset "Backward jump means we're in a loop. - check for possible interrupts. - check for long-running loops and JIT if appropriate." | switched | <inline: true> offset < 0 ifTrue: [localSP < stackLimit ifTrue: [self externalizeIPandSP. switched := self checkForEventsMayContextSwitch: true. self returnToExecutive: true postContextSwitch: switched. self browserPluginReturnIfNeeded. self internalizeIPandSP]. method = lastBackwardJumpMethod ifTrue: [(backwardJumpCount := backwardJumpCount - 1) <= 0 ifTrue: [(self methodWithHeaderShouldBeCogged: (self headerOf: method)) ifTrue: [self externalizeFPandSP. self resetBackwardJumpVariables. "only to force variables to be global" self attemptToSwitchToMachineCode: (self oopForPointer: localIP) - offset - method - BaseHeaderSize - 1] ifFalse: "don't ask if one should compile a second time..." + [backwardJumpCount := 1 << (BytesPerWord * 8 - 2)]]] - [backwardJumpCount := 1 bitShift: BytesPerWord * 8 - 2]]] ifFalse: [lastBackwardJumpMethod := method. backwardJumpCount := minBackwardJumpCountForCompile]]! Item was added: + ----- Method: MiscPrimitivePlugin class>>monticelloDescription (in category 'translation') ----- + monticelloDescription + "Override to include the primitive-supplying classes." + "self monticelloDescription" + ^super monticelloDescription, '\' withCRs, + ((self translatedPrimitives + collect: [:pair| CCodeGenerator monticelloDescriptionFor: (Smalltalk classNamed: pair first)]) + asSet asArray sort reduce: [:a :b| a, '\' withCRs, b])! Item was added: + ----- Method: SoundGenerationPlugin class>>monticelloDescription (in category 'translation') ----- + monticelloDescription + "Override to include the AbstractSound class." + "self monticelloDescription" + ^super monticelloDescription, '\' withCRs, (CCodeGenerator monticelloDescriptionFor: AbstractSound)! Item was changed: ----- Method: StackInterpreter>>stackPageByteSize (in category 'stack pages') ----- stackPageByteSize "Room for 512 bytes of frames gives around 40 frames a page which is a good compromise between overflow rate and latency in divorcing a page." <inline: false> + ^1 << (512 + self stackLimitOffset + self stackPageHeadroom - 1) highBit! - ^1 bitShift: (512 + self stackLimitOffset + self stackPageHeadroom - 1) highBit! Item was changed: ----- Method: StackToRegisterMappingCogit>>registerMaskFor: (in category 'simulation stack') ----- registerMaskFor: reg "Answer a bit mask identifying the symbolic register. Registers are negative numbers." + ^1 << (1 - reg)! - ^1 bitShift: 1 - reg! Item was changed: ----- Method: StackToRegisterMappingCogit>>registerMaskFor:and: (in category 'simulation stack') ----- registerMaskFor: reg1 and: reg2 "Answer a bit mask identifying the symbolic registers. Registers are negative numbers." + ^1 << (1 - reg1) bitOr: 1 << (1 - reg2)! - ^(1 bitShift: 1 - reg1) bitOr: (1 bitShift: 1 - reg2)! Item was changed: ----- Method: StackToRegisterMappingCogit>>registerMaskFor:and:and: (in category 'simulation stack') ----- registerMaskFor: reg1 and: reg2 and: reg3 "Answer a bit mask identifying the symbolic registers. Registers are negative numbers." + ^(1 << (1 - reg1) bitOr: 1 << (1 - reg2)) bitOr: 1 << (1 - reg3)! - ^((1 bitShift: 1 - reg1) bitOr: (1 bitShift: 1 - reg2)) bitOr: (1 bitShift: 1 - reg3)! Item was added: + ----- Method: VMClass class>>monticelloDescription (in category 'translation') ----- + monticelloDescription + "Answer the Monticello version of the packlage containing the receiver. + This is a hook to allow subclasses to expand upon the default monticello description." + ^CCodeGenerator monticelloDescriptionFor: self!

1 0

[commit][2654] update help & run files for 3.9
by commits＠squeakvm.org 03 Jan '13

03 Jan '13

Revision: 2654 Author: rowledge Date: 2013-01-02 20:59:02 -0800 (Wed, 02 Jan 2013) Log Message: ----------- update help & run files for 3.9 Modified Paths: -------------- trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!Help trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!run Modified: trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!Help =================================================================== --- trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!Help 2013-01-03 04:52:45 UTC (rev 2653) +++ trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!Help 2013-01-03 04:59:02 UTC (rev 2654) @@ -3,7 +3,7 @@ What is this? ------------- -This is the RISC OS port of Squeak 3.8, a public domain Smalltalk system. +This is the RISC OS port of Squeak 3.9, a public domain Smalltalk system. Updates, patches etc are available from: http://www.rowledge.org/tim/squeak as and when I can make time to produce then. The main website for the Squeak project is: @@ -24,7 +24,7 @@ Smalltalk is the original object oriented programming language and environment from which most OSs have learnt about windowing, pixel displays, menus and so on. You will need to read about Smalltalk to make best use of it, since it is likely to be quite unfamiliar to you at first. Be warned, the user interface is not quite like RISC OS; in particular:- -a) the right hand mouse button is NOT used as 'adjust', but to operate on the window currently active; thus serving many of the functions of the window icons under RISC OS. +a) the right hand mouse button is NOT used as 'adjust', but to operate on the window currently active; thus serving many of the functions of the window icons under RISC OS. b) the menus make the choice when you _release_ the menu button over an item. So, press the menu button and hold it down whilst you make your choice. c) as you will quickly notice, the Squeak windows can exist only within the single big RiscOS window. This may change later. @@ -32,14 +32,8 @@ ------------------ For those with web access, there is plenty of information available about Squeak and all the other variants of Smalltalk. See http://www.squeak.org/ -the Squeak.Org main site for updates, releases, goodies etc and perhaps most important, the squeak mailing list. You may get yourself onto the list by sending email to: +the Squeak.Org main site for updates, releases, goodies etc and perhaps most important, the squeak mailing list. You may get yourself onto the list by visiting the 'Squeak Mailing Lists' page on the main website. - squeak-dev-request(a)lists.squeakfoundation.org - -with the subject line set to - - -subscribe - Printed Information ------------------- In print there are a number of good sources, some of which you might find on the shelves in better bookstores:- @@ -64,7 +58,7 @@ Designing Object-Oriented Software, Rebecca Wirfs-Brock, Brian Wilkerson, and Lauren Wiener Prentice-Hall 1990 ISBN 0-13-629825-7 - Squeak specific + Squeak specific Squeak, Open Personal Computing for Multimedia, Mark Guzdial & Kim Rose, editors, 2001, Prentice-Hall Squeak: Object-oriented design with Multimedia Applications, Mark @@ -93,39 +87,11 @@ The legal bit ============= -The license under which Squeak is provided is specified by Apple Computer and can be found in full on http://www.squeak.org:- - .:. Plain English Examples of License Terms - .:. Our license agreement contains conditions intended to keep - .:. Squeak open and available to the user community, while - .:. allowing users to do useful things with Squeak. You will see - .:. the license once you begin installing Squeak. These following - .:. examples are provided as illustrations and are not legally - .:. binding. See the license for the real terms. To the extent that - .:. the examples and the license conflict, the license will govern. - .:. - .:. You are allowed to change Squeak, write extensions to - .:. Squeak, build an application in Squeak, and include some or - .:. all of Squeak with your products. You may distribute all of - .:. these things along with Squeak, or portions of Squeak, for free - .:. or for money. However, you must distribute these things under - .:. a license that protects Apple in the way described in our - .:. license to you. - .:. - .:. If you modify any of the methods of class objects (or their - .:. relationships) that come with Squeak (as opposed to building - .:. on top of what we provide), you must post the modifications - .:. on a web site or otherwise make them available for free to - .:. others, just as we have done with Squeak. Our license to you - .:. explains how you must do this. - .:. - .:. The same is true if you port Squeak to another machine or - .:. operating system - you must post your port on a web site or - .:. otherwise make it available for free to others under the terms - .:. described in our license to you. +The license under which Squeak is provided - the MIT License, with some portions covered by the Apache License version 2.0- can be found in full on http://www.squeak.org Finally ------- -Have fun, join the mailing list, let us know how you do. +Have fun, join the mailing list, let us know how you do. tim Modified: trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!run =================================================================== --- trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!run 2013-01-03 04:52:45 UTC (rev 2653) +++ trunk/platforms/RiscOS/misc/ToCopy/!Squeak/!run 2013-01-03 04:59:02 UTC (rev 2654) @@ -1,15 +1,22 @@ Wimpslot -min 400K -max 700k Set Squeak$Dir <Obey$Dir> + +| Timers: we're either using the druck TimerMod or the Rik Griffin HALTimer + | Make sure the MillisecondTimer & HALTimer module are loaded -RMEnsure HALTimer 0.03 RMLoad <Squeak$Dir>.modules.HALTimer -RMEnsure MillisecondTimer 1.00 RMLoad <Squeak$Dir>.modules.MillisecondTimer +|RMEnsure HALTimer 0.03 RMLoad <Squeak$Dir>.modules.HALTimer +|RMEnsure MillisecondTimer 1.00 RMLoad <Squeak$Dir>.modules.MillisecondTimer +| +RMEnsure TimerMod 4.12 RMLoad <Squeak$Dir>.modules.TimerMod.TimerMod + + | syntax: | {appname} [-vmoption [-vmoption]] imagefilepath [startupfile/URL] [imageoption [imageoption]] | vmoptions - | -version | Display the version info in a dialogue box | -help -| Open the help file +| Open the help file | -memory:<number>[m|k] | Specify amount of free space to attempt to allocate for Squeak's object | memory. More will be claimed for the display sprite that is used. @@ -31,4 +38,4 @@ | imageoption - any words following will be available to the image via | Smalltalk getSystemAttribute: -{1000, 1} /<Squeak$Dir>.!Boot -/<Squeak$Dir>.!RunImage -memory:50m %*0 \ No newline at end of file +/<Squeak$Dir>.!RunImage -memory:90m %*0 \ No newline at end of file

1 0

[commit][2653] add TimerMod
by commits＠squeakvm.org 03 Jan '13

03 Jan '13

Revision: 2653 Author: rowledge Date: 2013-01-02 20:52:45 -0800 (Wed, 02 Jan 2013) Log Message: ----------- add TimerMod Added Paths: ----------- trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod/ trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod/TimeX trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod/TimerMod trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod/TimerModDc Added: trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod/TimeX =================================================================== --- trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod/TimeX (rev 0) +++ trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod/TimeX 2013-01-03 04:52:45 UTC (rev 2653) @@ -0,0 +1,8 @@ +| +| Put this file on your Run$Path, and alter the RMLoad below +| to load the TimerMod module if it is not in the same directory +| +RMEnsure TimerMod 1.00 RMLoad <Obey$Dir>.TimerMod +TimerStart +%*0 +TimerStop \ No newline at end of file Property changes on: trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod/TimeX ___________________________________________________________________ Added: svn:riscosfiletype + feb Added: trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod/TimerMod =================================================================== (Binary files differ) Property changes on: trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod/TimerMod ___________________________________________________________________ Added: svn:riscosfiletype + ffa Added: svn:mime-type + application/octet-stream Added: trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod/TimerModDc =================================================================== --- trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod/TimerModDc (rev 0) +++ trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/TimerMod/TimerModDc 2013-01-03 04:52:45 UTC (rev 2653) @@ -0,0 +1,75 @@ + +Timer Module +===== ====== + +\xA9 1991-2003 DEEJ Technology PLC + +Provides SWI's and *commands for use in timing programs. +SWI chunk base &490C0 (Acorn Registered). + +SWI "Timer_Start" Turns timer on. +SWI "Timer_Stop" Returns time interval between last Timer Start, + may be called many times. + R0 = time in seconds + R1 = remainder in microseconds +SWI "Timer_Value" Returns monotonoc time in seconds and microseconds. + R0 = time in seconds + R1 = remainder in microseconds + +*TimerStart Equivelent to SWI "Timer_Start" +*TimerStop Stops timer and prints time elapsed message. +*TimerValue Prints monotonic time to microsecond resolution. +*TimedOS Creates GOS type command shell and times all + commands given until a *QUIT, (remember Arthur OS?) + + +==> Help on keyword TimerMod +Module is: Timer Module 4.12 (04-Feb-2003) [32bit] + +Commands provided: +TimerStart TimerStop TimerValue TimedOS + +It has help on: +TimerMod + +==> Help on keyword TimerStart +*TimerStart starts the Timer module interval timer, canceling any previous TimerStart. +Syntax: *TimerStart + + +==> Help on keyword TimerStop +*TimerStop stops the Timer module interval timer, printing the time elapsed since the last TimerStart. +Syntax: *TimerStop + + +==> Help on keyword TimerValue +*TimerValue prints the system monotonic time to microsceond resolution. +Syntax: *TimerValue + + +Technical Information +--------------------- + +On all machines the module uses the CMOS clock for time calculations to +1 centisecond resolution. Microsecond resolution is provided by hardware +specific timers. On Risc PC, A7000 and Archimedes machines the 2MHz +IOMD/IOC timer 0 is used. On RISC OS 5 machines the HAL counter 0 is +read, which on the Iyonix is provided by the XScale 80321 and runs at 200MHz. + + +SWI numbers +----------- +Timer_Start &490C0 +Timer_Stop &490C1 +Timer_Value &490C2 + + +Versions +-------- +1.00 Initial release +2.00 *commands added +3.00 SWI chunk base now registered with Acorn +4.00 Iyonic HAL and 32bit neutral version +4.10 Uses own time to string routine to prevent timezone offsets +4.11 Fixed counter wrapping comparison bug +4.12 Fixed IOC conter off by 1 \ No newline at end of file

1 0

[commit][2652] bringing some RISC OS code up to date circa 3.9
by commits＠squeakvm.org 03 Jan '13

03 Jan '13

Revision: 2652 Author: rowledge Date: 2013-01-02 19:39:18 -0800 (Wed, 02 Jan 2013) Log Message: ----------- bringing some RISC OS code up to date circa 3.9 Modified Paths: -------------- trunk/platforms/RiscOS/vm/sqArgument.c trunk/platforms/RiscOS/vm/sqPlatformSpecific.h trunk/platforms/RiscOS/vm/sqRPCEvents.c trunk/platforms/RiscOS/vm/sqRPCMain.c trunk/platforms/RiscOS/vm/sqRPCWindows.c Modified: trunk/platforms/RiscOS/vm/sqArgument.c =================================================================== --- trunk/platforms/RiscOS/vm/sqArgument.c 2013-01-03 02:31:11 UTC (rev 2651) +++ trunk/platforms/RiscOS/vm/sqArgument.c 2013-01-03 03:39:18 UTC (rev 2652) @@ -24,7 +24,7 @@ static char** optionArray; int ImageVersionNumber; -static char* nextOption() { +static char* nextOption(void) { if(opt >= numOptions) return 0; return optionArray[opt++]; } Modified: trunk/platforms/RiscOS/vm/sqPlatformSpecific.h =================================================================== --- trunk/platforms/RiscOS/vm/sqPlatformSpecific.h 2013-01-03 02:31:11 UTC (rev 2651) +++ trunk/platforms/RiscOS/vm/sqPlatformSpecific.h 2013-01-03 03:39:18 UTC (rev 2652) @@ -60,34 +60,45 @@ dst[num] = 0;\ } - -/* undefine this to stop using my MillisecondTimer module and rely upon clock() - * instead. You lose millisecond precision in the process */ -#define TIMERMOD -usqInt millisecondValue(void); -unsigned int microsecondsvalue(void); /* undefine clock macros that are implemented as functions */ +/* basic millisecond timer value */ #undef ioMSecs -#define ioMSecs() (sqInt)(millisecondValue()) -#undef ioMicroMSecs + +/* less important timer, return mSec values but can be lower actual resolution */ #undef ioLowResMSecs -#define ioLowResMSecs() (ioMSecs()) +/* a high-res timer for debugging */ +unsigned int microsecondsvalue(void); +/* define one or other of these to choose the time system in use + DRUCKTIMERMOD means using the TimerMod by druck; this is intended for + microsecond timers for unixy programs etc + HALTIMERMOD means using a combination of Rik Griffin's HALTimer and + my MillisecondTimer to keep a runing count of milliseconds + Currently HALTimer won't run on a RaspberryPi, so use drucks code */ +#define DRUCKTIMERMOD +// #define HALTIMERMOD + +usqInt millisecondTimerValue(void); +#define ioMSecs() (sqInt)(millisecondTimerValue()) +#define ioLowResMSecs() (sqInt)(millisecondTimerValue()) + + + /* extended fileplugin support */ extern int dir_DirectoryExists(char *pathString, int pathStringLength); extern int dir_FileExists(char *pathString, int pathStringLength); -extern void dir_SetImageFileType(void); +extern void dir_SetImageFileType(void); /* Debugging support - printf is #def'd to repprint which outputs to * a logfile or to !Reporter if it is active */ -#ifdef DEBUG +#ifdef DEBUG #define PRINTF(s)\ {\ printf s;\ }; #else -#define PRINTF(s) +#define PRINTF(s) #endif extern int repprintf(const char * format, ...); @@ -106,7 +117,7 @@ struct windowDescriptorBlock * next; wimp_w handle; int windowIndex; - os_coord bitmapExtentP; + os_coord bitmapExtentP; os_box visibleArea; // rename to visibleArea int squeakDisplayDepth; osspriteop_header * displaySprite; // the sprite pointer @@ -123,7 +134,7 @@ #define OS2PixX(val) ((val)>>scalingFactor.x) #define OS2PixY(val) ((val)>>scalingFactor.y) - + #define Pix2OSX(val) ((val)<<scalingFactor.x) #define Pix2OSY(val) ((val)<<scalingFactor.y) Modified: trunk/platforms/RiscOS/vm/sqRPCEvents.c =================================================================== --- trunk/platforms/RiscOS/vm/sqRPCEvents.c 2013-01-03 02:31:11 UTC (rev 2651) +++ trunk/platforms/RiscOS/vm/sqRPCEvents.c 2013-01-03 03:39:18 UTC (rev 2652) @@ -7,7 +7,7 @@ /* OS interface stuff */ /**************************************************************************/ -/* To recompile this reliably you will need */ +/* To recompile this reliably you will need */ /* OSLib - http://ro-oslib.sourceforge.net/ */ /* Castle/AcornC/C++, the Acorn TCPIPLib */ /* and a little luck */ @@ -103,7 +103,7 @@ /* Squeak expects to get kbd modifiers as the top 4bits of the 8bit char code, * or as the 2r1111000 bits of the buttons word. RiscOS doesnt give me the * modifiers with keypresses, so we have to manually collect them. SQ only - * seems to care about them when doing primMouseButtons anyway. + * seems to care about them when doing primMouseButtons anyway. * ST bits: <command><option><control><shift> * Notice how Macish this is! */ @@ -226,7 +226,7 @@ /* 0x67 k-enter */ /* 0x0d */ 0 }; - + /*** Functions ***/ void DisplayPixmap(wimp_draw * wblock); extern void DisplayModeChanged(void); @@ -286,7 +286,7 @@ static windowDescriptorBlock * lastWindow = NULL; /* Don't mouse poll more than once every 5 milliseconds */ - if ( nextMousePollTick > (thisTick = millisecondValue())) return; + if ( nextMousePollTick > (thisTick = ioMSecs())) return; nextMousePollTick = thisTick + 5; if ( mouseButtonDown || windowActive) { @@ -315,7 +315,7 @@ * and thisWindow will be 0. At this point we'd like to know the * window that _was_ active so we can use it instead of thisWindow. * While buttonDown is true we need to maintain the same window. - * + * * It is possible for a MousePoll to hpapen before a leave is processed, * (ie windowActive is improperly true) so we should check and ignore * the mouse pos. @@ -430,7 +430,7 @@ UserMessage(&(pollBlock->message)); break; case wimp_USER_MESSAGE_ACKNOWLEDGE : UserMessage(&(pollBlock->message)); break; - } + } return true; } @@ -445,14 +445,14 @@ #if 0 /* this is pretty much obsolete - we can't do microsecond delays and - * anything longer just slows Squeak down horribly */ + * anything longer just slows Squeak down horribly */ int HandleEventsWithWait(int microSecondsToDelay) { /* use wimp_poll_delay so that we don't return a null before * the end of the delay, thus giving some cpu back to everyone else * NB - RISC OS uses centi-Seconds for delays etc. */ int pollDelay, nextWakeTick, currentTick; -extern int getNextWakeupTick(void); +extern int getNextWakeupTick(void); pollDelay = microSecondsToDelay /* * CLOCKS_PER_SEC / 1000000 */ >> 14 /* will always give small answer, but good enough */; if ( microSecondsToDelay ) { @@ -516,10 +516,10 @@ * those times are redundant, throttle it back a little */ static int nextPollTick = 0; unsigned int thisTick; - if ( nextPollTick > (thisTick = millisecondValue())) return false; + if ( nextPollTick > (thisTick = ioMSecs())) return false; HandleEvents(); nextPollTick = thisTick +5; - return true; + return true; } /****************************************/ @@ -612,7 +612,7 @@ if ((wblock->buttons == wimp_CLICK_SELECT)) { /* select-click on iconbar icon means bring window to front * - but what if we have multiple windows? */ - extern void SetWindowToTop(int windowIndex); + extern void SetWindowToTop(int windowIndex); SetWindowToTop(1); return; } @@ -621,12 +621,12 @@ return; } } - + /* need the window block with this handle */ thisWindow = (windowDescriptorBlock *)windowBlockFromHandle(wblock->w); if ( thisWindow && (wblock->i == (wimp_i)wimp_ICON_WINDOW)) { - PRINTF(("\\t buttons %x w: %d\n", wblock->buttons, thisWindow->windowIndex)); + PRINTF(("\\t buttons %x w: %d\n", wblock->buttons, thisWindow->windowIndex)); /* claim caret via message_claimentity() iff we *don't already have it */ claimCaret(wblock); @@ -690,7 +690,7 @@ * if a key maps, replace the keystate with the result */ unsigned int testkey = (dblock->deepkey) - >>wimp_DEEPKEY_KEYNUMSHIFT; + >>wimp_DEEPKEY_KEYNUMSHIFT; if ((testkey <= 0x67) && (testkey = keymap[testkey]) ) keystate = testkey; } else { @@ -743,13 +743,13 @@ * can be found in c.sqRPCClipboard>fetchClipboard() */ case message_DATA_REQUEST: receivedDataRequest(wblock); - break; + break; case message_DATA_SAVE_ACK: receivedDataSaveAck(wblock); break; /* We _might_ sometime respond to DATA_LOAD & DATA_SAVE * here in order to allow dropping of text files via the * DropPlugin - */ + */ default: return; } } @@ -802,21 +802,21 @@ evt->modifiers = modifiers; evt->utf32Code = keyValue; /* what Unicode ? */ evt->reserved1 = 0; - evt->windowIndex = windowIndex; + evt->windowIndex = windowIndex; evt = (sqKeyboardEvent *)EventBufAppendEvent( EventTypeKeyboard); evt->charCode = keyValue; evt->pressCode = EventKeyChar; evt->modifiers = modifiers; evt->utf32Code = keyValue; /* what Unicode ? */ evt->reserved1 = 0; - evt->windowIndex = windowIndex; + evt->windowIndex = windowIndex; evt = (sqKeyboardEvent *)EventBufAppendEvent( EventTypeKeyboard); evt->charCode = keyValue; evt->pressCode = EventKeyUp; evt->modifiers = modifiers; evt->utf32Code = keyValue; /* what Unicode ? */ evt->reserved1 = 0; - evt->windowIndex = windowIndex; + evt->windowIndex = windowIndex; } void EventBufAppendMouse( int buttons, int modifiers, int x, int y, int windowIndex) { @@ -849,7 +849,7 @@ evt->value2 = top; evt->value3 = right; evt->value4 = bottom; - evt->windowIndex = windowIndex; + evt->windowIndex = windowIndex; } /* key buffer functions to support older images */ @@ -887,7 +887,7 @@ // if (evt->type == EventTypeKeyboard) { // PRINTF(("\\t key ev(%d) read %c\n", evt->timeStamp, ((sqKeyboardEvent *)evt)->charCode)); // } -// #endif +// #endif return true; } @@ -922,7 +922,7 @@ * in the middle of one already */ HandleEvents(); - return true; + return true; } /* older polling state style access - completely unused by images after Modified: trunk/platforms/RiscOS/vm/sqRPCMain.c =================================================================== --- trunk/platforms/RiscOS/vm/sqRPCMain.c 2013-01-03 02:31:11 UTC (rev 2651) +++ trunk/platforms/RiscOS/vm/sqRPCMain.c 2013-01-03 03:39:18 UTC (rev 2652) @@ -7,7 +7,7 @@ /* OS interface stuff, commandline option handling and so on */ /**************************************************************************/ -/* To recompile this reliably you will need */ +/* To recompile this reliably you will need */ /* OSLib - http://ro-oslib.sourceforge.net/ */ /* Castle/AcornC/C++, the Acorn TCPIPLib */ /* and a little luck */ @@ -45,20 +45,22 @@ os_error privateErr; char versionString[20]; static FILE *logfile= 0; +#ifdef HALTIMERMOD static unsigned int *timerValPtr; +#endif /* argument handling stuff -- see c.sqArgument */ int numOptionsVM; char *(vmOptions[MAX_OPTIONS]); int numOptionsImage; char *(imageOptions[MAX_OPTIONS]); - + int headlessFlag = 0; int helpMe = 0; int versionMe = 0; int swapMeta = 0; int objectHeadroom = 4*1024*1024; -char *windowLabel, *taskNameArg; +char *windowLabel, *taskNameArg; int useDAMemory = 0; vmArg args[] = { @@ -68,7 +70,7 @@ { ARG_FLAG, &useDAMemory, "-useDA" }, { ARG_FLAG, &swapMeta, "-swapmeta"}, { ARG_UINT, &objectHeadroom, "-memory:"}, - { ARG_STRING, &windowLabel, "-windowlabel:"}, + { ARG_STRING, &windowLabel, "-windowlabel:"}, { ARG_STRING, &taskNameArg, "-taskname:"}, { ARG_NONE, NULL, NULL } }; @@ -106,7 +108,7 @@ logfile = (FILE *)-1; return 0; } - return (int)logfile; + return (int)logfile; } /* override printf() * - see also the #define printf repprintf in sqPlatforSpecific.h @@ -154,7 +156,7 @@ } char*rinkMalloc(size_t size) { - printf("\\t rink alloc %d\n", (int)size); + PRINTF(("\\t rink alloc %d\n", (int)size)); return malloc(size); } @@ -166,7 +168,7 @@ PRINTF(("\\t platAllocateMemory requesting: %08x\n", amount)); /* work out the size of dynamic area allowed to see if we can use a large * application space allocation. On RISC OS 4 or if Aemulor is running - * on RISC OS 5, we can't. We also have the -useDA cmdline flag */ + * on RISC OS 5, we can't. We also have the -useDA cmdline flag */ if ((e = xos_read_dynamic_area( os_DYNAMIC_AREA_APPLICATION_SPACE, &daBaseAddress, @@ -208,7 +210,7 @@ platReportFatalError(&privateErr); return false; } - } + } PRINTF(("\\t platAllocateMemory(%d) at %0x\n", amount, (int)daBaseAddress)); @@ -219,11 +221,14 @@ void setTimer(void) { /* Initialise the MillisecondTimer value address */ -#ifdef TIMERMOD _kernel_swi_regs regs; +#ifdef HALTIMERMOD _kernel_swi(/* MillisecondTimer_Val_Ptr*/ 0x58101, &regs, &regs); timerValPtr = (unsigned int *)(regs.r[0]); #endif +#ifdef DRUCKTIMERMOD + _kernel_swi(/* Timer_Start*/ 0x490C0, &regs, &regs); +#endif } @@ -314,7 +319,7 @@ int ioAssertion(void) { return 1; } - + void exit_function(void) { /* do we need to do any special tidy up here ? RiscOS needs to kill the pointer bitmap and release the dynamic areas @@ -333,14 +338,32 @@ if ( (int)logfile > 0) fclose( logfile); } +usqInt millisecondTimerValue(void) { +/* return the raw unsigned value of the millsecond time for internal VM use */ +_kernel_swi_regs regs; +#ifdef DRUCKTIMERMOD + _kernel_swi(/* Timer_Value*/ 0x490C2, &regs, &regs); + return (usqInt)(regs.r[0] * 1000) + (int)(regs.r[1] / 1000); +#endif +#ifdef HALTIMERMOD +// _kernel_swi(/* MillisecondTimer_Value */ 0x58100, &regs, &regs); +// return (regs.r[0]) ; + return (usqIt)*timerValPtr; +#endif +} + unsigned int microsecondsvalue(void) { /* return the microsecond value (ignoring wrap arounds etc) for debug timer * purposes */ +#ifdef DRUCKTIMERMOD _kernel_swi_regs regs; _kernel_swi(/* Timer_Value*/ 0x490C2, &regs, &regs); return ((regs.r[0] %1000) * 1000000) + (int)(regs.r[1]) ; - +#endif +#ifdef HALTIMERMOD + return 1000 * millisecondTimerValue(); +#endif } sqInt ioMicroMSecs(void) { @@ -352,24 +375,14 @@ in units of milliseconds.) This clock must have enough precision to provide accurate timings, and normally isn't called frequently enough to slow down the VM. Thus, it can use a more expensive clock - than ioMSecs(). + that ioMSecs(). + This has to be a separate function because it is involved in the + function table in sqVirtualMachine.c */ - return (sqInt)millisecondValue(); -} + return millisecondTimerValue(); -usqInt millisecondValue(void) { -/* return the raw unsigned value of the millsecond time for internal VM use */ -#ifdef TIMERMOD -_kernel_swi_regs regs; -// _kernel_swi(/* MillisecondTimer_Value */ 0x58100, &regs, &regs); -// return (regs.r[0]) ; - return *timerValPtr; -#else - return (clock() * 1000/CLOCKS_PER_SEC); -#endif } - sqInt ioSeconds(void) { /* Unix epoch to Smalltalk epoch conversion. (Date newDay: 1 year: 1970) asSeconds @@ -602,7 +615,7 @@ if ((id < 0) && ( -id < numOptionsVM)) { tmp = vmOptions[-id]; if (*tmp) return tmp; - } + } if ((id > 1) &&(id <= numOptionsImage)) { // we have an offset of 1 for + ids in // order to accommodate the vmPath at 0 @@ -611,7 +624,7 @@ } /* fail the prim to ensure we return nil instead of an empty string */ success(false); - return ""; + return ""; } sqInt attributeSize(sqInt id) { @@ -646,7 +659,7 @@ fclose(f); sprintf(runHelp, "chain:Filer_Run %s%s\n", progname, helpname); system(runHelp); - } + } } void versionMessage(char * progname) { Modified: trunk/platforms/RiscOS/vm/sqRPCWindows.c =================================================================== --- trunk/platforms/RiscOS/vm/sqRPCWindows.c 2013-01-03 02:31:11 UTC (rev 2651) +++ trunk/platforms/RiscOS/vm/sqRPCWindows.c 2013-01-03 03:39:18 UTC (rev 2652) @@ -88,6 +88,8 @@ /* Display related stuff */ void GetDisplayParameters(void) { +// Read the screen metrics - size, bits per pixels, pixel<->os unit +// scaling factors int bpp; bits junk; /* get the screen size x & y */ @@ -117,26 +119,17 @@ #endif } -int ioIconiseWindow(wimp_message * wblock) { -/* We received an iconise message. Send the image a message to let it know */ -extern void EventBufAppendWindow( int action, int left, int top, int right, int bottom, int windowIndex); -windowDescriptorBlock * thisWindow; - /* need the window block with this handle */ - thisWindow = windowBlockFromHandle(((wimp_full_message_iconise *)wblock)->w); - PRINTF(("\\t Iconise %d\n", thisWindow->windowIndex)); - EventBufAppendWindow( WindowEventIconise, 0, 0, 0, 0, - thisWindow->windowIndex); -} - void SetDefaultPointer(void) { -/* setup the pointer buffer for use in the Squeak window */ +/* setup the pointer buffer as shape #2 for use in the Squeak window + In theory this ought to be replaced with calls to xwimpspriteop_set_pointer_shape() */ xwimp_set_pointer_shape(2, (byte const *)pointerBuffer, 16, 16, 0, 0); /* and then return the pointer to no.1 */ xwimp_set_pointer_shape(1, (byte const *)-1, 0, 0, 0, 0); } /* window list management */ +/* we maintain a linked list of windowDescriptorBlocks describing each of the window created and used.*/ windowDescriptorBlock *windowBlockFromIndex(int windowIndex) { windowDescriptorBlock *entry; @@ -234,12 +227,14 @@ } /* displaying bitmap related routines */ +/* we have to do pixel transformations as part of converting from a stupid big-endian Form layout to RISC OSs format */ void reverseNothing(void) { /* do nothing, as fast as possible */ } void reverse_image_1bpps(void) { +/* reverse the order of each bit winth the word */ unsigned int * srcPtr, *dstPtr; int j; for(j = startY; j < stopY; j += scanLine) { @@ -261,6 +256,7 @@ } void reverse_image_2bpps(void) { +/* swap 2-bit chunks ofwords */ unsigned int * srcPtr, *dstPtr; int j; for(j = startY; j < stopY; j += scanLine) { @@ -282,6 +278,7 @@ } void reverse_image_4bpps(void) { +/* swap 4-bit chunks of words */ unsigned int * srcPtr, *dstPtr; int j; for(j = startY; j < stopY; j += scanLine) { @@ -313,6 +310,7 @@ } void reverse_image_bytes(void) { +/* swap byte chunks of words */ unsigned int * srcPtr, *dstPtr; int j; for(j = startY; j < stopY; j += scanLine) { @@ -336,6 +334,7 @@ } void reverse_image_words(void) { +/* swap 15-bit chunks out of 16 bit words within the 32-bit word; we askip over the alpha bit assumed in other OSs */ unsigned int * srcPtr, *dstPtr; int j; for(j = startY; j < stopY; j += scanLine) { @@ -350,6 +349,7 @@ nw = (nw << 5) | (w & 0x1F); w = w >> 5; nw = (nw << 5) | (w & 0x1F); + // shift an extra bit to drop the alpha bit w = w >> 6; nw = (nw << 6) | (w & 0x1F); w = w >> 5; @@ -363,6 +363,7 @@ } void reverse_image_longs(void) { +/* swap 24-bit chunks out of 32-bit words. Skip the alpha bit assumed in some other OSs */ unsigned int * srcPtr, *dstPtr; int j; for(j = startY; j < stopY; j += scanLine) { @@ -384,6 +385,7 @@ } void simple_copy_image(void) { +/* yay - no swapping version for some usages */ unsigned int * srcPtr, *dstPtr; int j; for(j = startY; j < stopY; j += scanLine) { @@ -398,6 +400,7 @@ } void DisplayReverseArea(windowDescriptorBlock * thisWindow, int x0, int y0, int x1, int y1) { +/* we have to process each pixel in the rectangle */ int stopX, pixelsPerWord, pixelsPerWordShift; #ifdef DEBUG unsigned int startTime, stopTime; @@ -452,13 +455,15 @@ thisWindow = (windowDescriptorBlock *)windowBlockFromHandle(wblock->w); if ( thisWindow->displaySprite == NULL ) { - /* flush the damage rectangles, we're not set up yet */ + /* there's no window set up yet, so flush the damage rectangles */ more = wimp_redraw_window( wblock ); while ( more ) { xwimp_get_rectangle (wblock, &more); } return; } + /* for each damage region in this window, update the display by writing the rectangle of our displaySprite + with the appropriate scaling and pixel translation table. It really ought to be simpler than this */ more = wimp_redraw_window( wblock ); while ( more ) { PRINTF(("\\t display pixmap l:%d t:%d r:%d b:%d\n", wblock->box.x0, wblock->box.y1, wblock->box.x1, wblock->box.y0)); @@ -562,7 +567,7 @@ void SetupWindowTitle(void) { /* set the root window title string. * if the -windowlabel: option was used, the title is the - * string given; limited to the last WindowTitleLength (150) chars. + * string given; if it's too long only the last WindowTitleLength (150) chars are used. */ extern char * windowLabel; char * string; @@ -795,7 +800,7 @@ os_DYNAMIC_AREA_APPLICATION_SPACE, neededSize, (byte const*)-1, - (bits)128, // stops it being draggable size in taskmanager + os_AREA_NO_USER_DRAG, // stops it being draggable size in taskmanager 40*1024*1024, // -1 means 'unlimited' NULL, NULL, @@ -904,15 +909,10 @@ void BuildWindow(windowDescriptorBlock * thisWindow) { /* Do the basic building of a window. - * if isIndirected, then the title is a pointer to a _global_ var string - * and the indirected flag must be set. + * + * Create a window block and set various structures and flags to suit the windowDescriptorBlock * Otherwise the title is copied into the literal string in the structure */ -/* create a window of width and height, centred on the screen - * since it is possible that width and height are not possible on the screen - * we check against the screen metrics and modify, then set the - * global values as required. - */ wimp_window wblock; os_error * e; wimp_w w; @@ -936,7 +936,7 @@ wblock.flags = wimp_WINDOW_NEW_FORMAT | wimp_WINDOW_MOVEABLE | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT - | thisWindow->attributes; + | thisWindow->attributes; // <--- these are the flags settable from Squeak /* colours */ wblock.title_fg = wimp_COLOUR_BLACK; wblock.title_bg = wimp_COLOUR_LIGHT_GREY; @@ -962,7 +962,9 @@ /* minimum window size allowed */ wblock.xmin = (short)100; wblock.ymin = (short)100; - /* window title - limited to 151 chars by struct defn */ + /* window title - limited to 151 chars by struct defn + * since it is indirected, the title is a pointer to a _global_ var string + * and the wimp_ICON_INDIRECTED flag must be set (above).*/ wblock.title_data.indirected_text.text = thisWindow->title; wblock.title_data.indirected_text.validation = (char*)-1; wblock.title_data.indirected_text.size = strlen(thisWindow->title); @@ -970,12 +972,12 @@ wblock.icon_count = 0; /* wblock.icons = (wimp_icon *)NULL;*/ - /* call wimp_createWindow */ + /* call wimp_create_window to actaully do the deed */ if ( (e = xwimp_create_window(&wblock, &w)) != NULL) { platReportFatalError(e); return; } - /* save the window handle */ + /* save the window handle in the windowDescriptorBlock */ thisWindow->handle = w; /* actually set the window size/position - may modify windowVisibleArea */ @@ -1136,6 +1138,7 @@ while(windowListRoot) { DeleteWindow(windowListRoot); } + return true; } /* ioShowDisplayOnWindow: similar to ioShowDisplay but adds the int windowIndex @@ -1296,8 +1299,6 @@ * origin x/y for the window. Return the actual origin the OS * produced in (left<<16 || top) format or -1 for failure, as above */ windowDescriptorBlock * thisWindow; -wimp_window_state wblock; -os_error * e; int w,h; thisWindow = (windowDescriptorBlock *)windowBlockFromIndex(windowIndex); @@ -1332,6 +1333,7 @@ /* ioSetTitleOfWindow: args are int windowIndex, char* newTitle and * int size of new title. Fail with -1 if windowIndex is invalid, string is too long for platform etc. Leave previous title in place on failure */ windowDescriptorBlock * thisWindow; +os_error *e; thisWindow = (windowDescriptorBlock *)windowBlockFromIndex(windowIndex); if (thisWindow == NULL) { /* seems to be an invalid window index */ @@ -1341,19 +1343,24 @@ if ( sizeOfTitle > WindowTitleLength ) { return -1; } + PRINTF(( "\\t ioSetWindowTitle: string length & window ID ok\n")); /* check the titlebar flag is set */ - if ((thisWindow->attributes | wimp_WINDOW_TITLE_ICON) == 0 ) { + if ((thisWindow->attributes & wimp_WINDOW_TITLE_ICON) == 0 ) { return -1; } + PRINTF(( "\\t ioSetWindowTitle: titlebar flag ok\n")); /* copy to the window */ strncpy(thisWindow->title, newTitle, sizeOfTitle); thisWindow->title[sizeOfTitle] = '\0'; /* update the titlebar if the window is built */ if (thisWindow->handle) { - xwimp_force_redraw_furniture(thisWindow->handle, wimp_FURNITURE_TITLE); + if ((e = xwimp_force_redraw_furniture(thisWindow->handle, wimp_FURNITURE_TITLE)) != NULL) { + platReportError(e); + } } + PRINTF(( "\\t ioSetWindowTitle: should be ok\n")); return true; } @@ -1568,3 +1575,14 @@ } } +int ioIconiseWindow(wimp_message * wblock) { +/* We received an iconise message. Send the image a message to let it know */ +extern void EventBufAppendWindow( int action, int left, int top, int right, int bottom, int windowIndex); +windowDescriptorBlock * thisWindow; + /* find the window block with this OS handle */ + thisWindow = windowBlockFromHandle(((wimp_full_message_iconise *)wblock)->w); + + PRINTF(("\\t Iconise window: %d\n",thisWindow->windowIndex)); + EventBufAppendWindow( WindowEventIconise, 0,0,0,0, thisWindow->windowIndex); + return true; +}

1 0

[commit][2651] CogVM source as per VMMaker.oscog-eem.246
by commits＠squeakvm.org 03 Jan '13

03 Jan '13

Revision: 2651 Author: eliot Date: 2013-01-02 18:31:11 -0800 (Wed, 02 Jan 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.246 Integrate changes from VMMaker-dtl.293 which use >> & << shifts in place of slower bitShift: code in plugins. Add width failure cases to BMPReadWriterPlugin read & write 24Bmp prims. Use ClassByteString var in preference to ClassString var. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 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/unix/vm/sqUnixMain.c branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/unixbuild/HowToBuild Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-01-03 00:56:53 UTC (rev 2650) +++ branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-01-03 02:31:11 UTC (rev 2651) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + VMPluginCodeGenerator VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 from - BMPReadWriterPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + BMPReadWriterPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; @@ -80,9 +80,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin VMMaker.oscog-eem.235 (i)" + "BMPReadWriterPlugin VMMaker.oscog-eem.246 (i)" #else - "BMPReadWriterPlugin VMMaker.oscog-eem.235 (e)" + "BMPReadWriterPlugin VMMaker.oscog-eem.246 (e)" #endif ; @@ -138,6 +138,9 @@ return primitiveFail(); } width = stackIntegerValue(0); + if (width <= 0) { + return primitiveFail(); + } formBitsIndex = stackIntegerValue(1); formBitsOop = stackObjectValue(2); pixelLineOop = stackObjectValue(3); @@ -188,6 +191,9 @@ return primitiveFail(); } width = stackIntegerValue(0); + if (width <= 0) { + return primitiveFail(); + } formBitsIndex = stackIntegerValue(1); formBitsOop = stackObjectValue(2); pixelLineOop = stackObjectValue(3); Modified: branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-01-03 00:56:53 UTC (rev 2650) +++ branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-01-03 02:31:11 UTC (rev 2651) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + VMPluginCodeGenerator VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 from - JPEGReaderPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + JPEGReaderPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; @@ -182,9 +182,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin VMMaker.oscog-eem.235 (i)" + "JPEGReaderPlugin VMMaker.oscog-eem.246 (i)" #else - "JPEGReaderPlugin VMMaker.oscog-eem.235 (e)" + "JPEGReaderPlugin VMMaker.oscog-eem.246 (e)" #endif ; static int *residuals; @@ -458,8 +458,12 @@ { sqInt bits; sqInt byte; + sqInt byte1; + sqInt byte2; sqInt i; sqInt index; + sqInt value; + sqInt value1; sqInt zeroCount; byte = jpegDecodeValueFromsize(dcTable, dcTableSize); @@ -467,10 +471,46 @@ return primitiveFail(); } if (byte != 0) { - bits = getBits(byte); + /* begin getBits: */ + if (byte > jsBitCount) { + /* begin fillBuffer */ + while (jsBitCount <= 16) { + if (!(jsPosition < jsReadLimit)) { + jsBitCount; + goto l3; + } + byte1 = jsCollection[jsPosition]; + jsPosition += 1; + if (byte1 == 255) { + + /* peek for 00 */ + + if (!((jsPosition < jsReadLimit) + && ((jsCollection[jsPosition]) == 0))) { + jsPosition -= 1; + jsBitCount; + goto l3; + } + jsPosition += 1; + } + jsBitBuffer = (((usqInt) jsBitBuffer << 8)) | byte1; + jsBitCount += 8; + } + jsBitCount; + l3: /* end fillBuffer */; + if (byte > jsBitCount) { + bits = -1; + goto l4; + } + } + jsBitCount -= byte; + value = ((usqInt) jsBitBuffer) >> jsBitCount; + jsBitBuffer = jsBitBuffer & ((1 << jsBitCount) - 1); + bits = value; + l4: /* end getBits: */; /* begin scaleAndSignExtend:inFieldWidth: */ - if (bits < ((((byte - 1) < 0) ? ((usqInt) 1 >> -(byte - 1)) : ((usqInt) 1 << (byte - 1))))) { - byte = (bits - (((byte < 0) ? ((usqInt) 1 >> -byte) : ((usqInt) 1 << byte)))) + 1; + if (bits < (1 << (byte - 1))) { + byte = (bits - (1 << byte)) + 1; goto l1; } else { @@ -494,10 +534,46 @@ byte = byte & 15; if (byte != 0) { index += zeroCount; - bits = getBits(byte); + /* begin getBits: */ + if (byte > jsBitCount) { + /* begin fillBuffer */ + while (jsBitCount <= 16) { + if (!(jsPosition < jsReadLimit)) { + jsBitCount; + goto l5; + } + byte2 = jsCollection[jsPosition]; + jsPosition += 1; + if (byte2 == 255) { + + /* peek for 00 */ + + if (!((jsPosition < jsReadLimit) + && ((jsCollection[jsPosition]) == 0))) { + jsPosition -= 1; + jsBitCount; + goto l5; + } + jsPosition += 1; + } + jsBitBuffer = (((usqInt) jsBitBuffer << 8)) | byte2; + jsBitCount += 8; + } + jsBitCount; + l5: /* end fillBuffer */; + if (byte > jsBitCount) { + bits = -1; + goto l6; + } + } + jsBitCount -= byte; + value1 = ((usqInt) jsBitBuffer) >> jsBitCount; + jsBitBuffer = jsBitBuffer & ((1 << jsBitCount) - 1); + bits = value1; + l6: /* end getBits: */; /* begin scaleAndSignExtend:inFieldWidth: */ - if (bits < ((((byte - 1) < 0) ? ((usqInt) 1 >> -(byte - 1)) : ((usqInt) 1 << (byte - 1))))) { - byte = (bits - (((byte < 0) ? ((usqInt) 1 >> -byte) : ((usqInt) 1 << byte)))) + 1; + if (bits < (1 << (byte - 1))) { + byte = (bits - (1 << byte)) + 1; goto l2; } else { @@ -587,9 +663,9 @@ return -1; } } - value = (((requestedBits - jsBitCount) < 0) ? ((usqInt) jsBitBuffer >> -(requestedBits - jsBitCount)) : ((usqInt) jsBitBuffer << (requestedBits - jsBitCount))); - jsBitBuffer = jsBitBuffer & (((((jsBitCount - requestedBits) < 0) ? ((usqInt) 1 >> -(jsBitCount - requestedBits)) : ((usqInt) 1 << (jsBitCount - requestedBits)))) - 1); jsBitCount -= requestedBits; + value = ((usqInt) jsBitBuffer) >> jsBitCount; + jsBitBuffer = jsBitBuffer & ((1 << jsBitCount) - 1); return value; } @@ -656,7 +732,7 @@ } } if (anACTerm == -1) { - dcval = ((usqInt) ((anArray[i]) * (qt[0])) << 2); + dcval = ((anArray[i]) * (qt[0])) << Pass1Bits; for (j = 0; j <= (DCTSize - 1); j += 1) { ws[(j * DCTSize) + i] = dcval; } @@ -669,8 +745,8 @@ t3 = z1 + (z2 * FIXn0n765366865); z2 = (anArray[i]) * (qt[i]); z3 = (anArray[(DCTSize * 4) + i]) * (qt[(DCTSize * 4) + i]); - t0 = ((usqInt) (z2 + z3) << 13); - t1 = ((usqInt) (z2 - z3) << 13); + t0 = (z2 + z3) << ConstBits; + t1 = (z2 - z3) << ConstBits; t10 = t0 + t3; t13 = t0 - t3; t11 = t1 + t2; @@ -714,8 +790,8 @@ z1 = (z2 + z3) * FIXn0n541196100; t2 = z1 + (z3 * (0 - FIXn1n847759065)); t3 = z1 + (z2 * FIXn0n765366865); - t0 = ((usqInt) ((ws[i]) + (ws[i + 4])) << 13); - t1 = ((usqInt) ((ws[i]) - (ws[i + 4])) << 13); + t0 = ((ws[i]) + (ws[i + 4])) << ConstBits; + t1 = ((ws[i]) - (ws[i + 4])) << ConstBits; t10 = t0 + t3; t13 = t0 - t3; t11 = t1 + t2; @@ -786,9 +862,11 @@ { sqInt bits; sqInt bitsNeeded; + sqInt byte; sqInt index; sqInt tableIndex; sqInt value; + sqInt value1; /* Initial bits needed */ @@ -802,10 +880,43 @@ tableIndex = 2; while (1) { + /* begin getBits: */ + if (bitsNeeded > jsBitCount) { + /* begin fillBuffer */ + while (jsBitCount <= 16) { + if (!(jsPosition < jsReadLimit)) { + jsBitCount; + goto l1; + } + byte = jsCollection[jsPosition]; + jsPosition += 1; + if (byte == 255) { - /* Get bits */ + /* peek for 00 */ - bits = getBits(bitsNeeded); + if (!((jsPosition < jsReadLimit) + && ((jsCollection[jsPosition]) == 0))) { + jsPosition -= 1; + jsBitCount; + goto l1; + } + jsPosition += 1; + } + jsBitBuffer = (((usqInt) jsBitBuffer << 8)) | byte; + jsBitCount += 8; + } + jsBitCount; + l1: /* end fillBuffer */; + if (bitsNeeded > jsBitCount) { + bits = -1; + goto l2; + } + } + jsBitCount -= bitsNeeded; + value1 = ((usqInt) jsBitBuffer) >> jsBitCount; + jsBitBuffer = jsBitBuffer & ((1 << jsBitCount) - 1); + bits = value1; + l2: /* end getBits: */; if (bits < 0) { return -1; } @@ -1309,10 +1420,14 @@ sqInt arrayOop; sqInt bits; sqInt byte; + sqInt byte1; + sqInt byte2; sqInt i; sqInt index; sqInt oop; sqInt streamOop; + sqInt value; + sqInt value1; sqInt zeroCount; ; @@ -1372,17 +1487,53 @@ goto l1; } if (byte != 0) { - bits = getBits(byte); + /* begin getBits: */ + if (byte > jsBitCount) { + /* begin fillBuffer */ + while (jsBitCount <= 16) { + if (!(jsPosition < jsReadLimit)) { + jsBitCount; + goto l2; + } + byte1 = jsCollection[jsPosition]; + jsPosition += 1; + if (byte1 == 255) { + + /* peek for 00 */ + + if (!((jsPosition < jsReadLimit) + && ((jsCollection[jsPosition]) == 0))) { + jsPosition -= 1; + jsBitCount; + goto l2; + } + jsPosition += 1; + } + jsBitBuffer = (((usqInt) jsBitBuffer << 8)) | byte1; + jsBitCount += 8; + } + jsBitCount; + l2: /* end fillBuffer */; + if (byte > jsBitCount) { + bits = -1; + goto l3; + } + } + jsBitCount -= byte; + value = ((usqInt) jsBitBuffer) >> jsBitCount; + jsBitBuffer = jsBitBuffer & ((1 << jsBitCount) - 1); + bits = value; + l3: /* end getBits: */; /* begin scaleAndSignExtend:inFieldWidth: */ - if (bits < ((((byte - 1) < 0) ? ((usqInt) 1 >> -(byte - 1)) : ((usqInt) 1 << (byte - 1))))) { - byte = (bits - (((byte < 0) ? ((usqInt) 1 >> -byte) : ((usqInt) 1 << byte)))) + 1; - goto l2; + if (bits < (1 << (byte - 1))) { + byte = (bits - (1 << byte)) + 1; + goto l4; } else { byte = bits; - goto l2; + goto l4; } - l2: /* end scaleAndSignExtend:inFieldWidth: */; + l4: /* end scaleAndSignExtend:inFieldWidth: */; } byte = yComponent[PriorDCValueIndex] = ((yComponent[PriorDCValueIndex]) + byte); anArray[0] = byte; @@ -1400,17 +1551,53 @@ byte = byte & 15; if (byte != 0) { index += zeroCount; - bits = getBits(byte); + /* begin getBits: */ + if (byte > jsBitCount) { + /* begin fillBuffer */ + while (jsBitCount <= 16) { + if (!(jsPosition < jsReadLimit)) { + jsBitCount; + goto l5; + } + byte2 = jsCollection[jsPosition]; + jsPosition += 1; + if (byte2 == 255) { + + /* peek for 00 */ + + if (!((jsPosition < jsReadLimit) + && ((jsCollection[jsPosition]) == 0))) { + jsPosition -= 1; + jsBitCount; + goto l5; + } + jsPosition += 1; + } + jsBitBuffer = (((usqInt) jsBitBuffer << 8)) | byte2; + jsBitCount += 8; + } + jsBitCount; + l5: /* end fillBuffer */; + if (byte > jsBitCount) { + bits = -1; + goto l6; + } + } + jsBitCount -= byte; + value1 = ((usqInt) jsBitBuffer) >> jsBitCount; + jsBitBuffer = jsBitBuffer & ((1 << jsBitCount) - 1); + bits = value1; + l6: /* end getBits: */; /* begin scaleAndSignExtend:inFieldWidth: */ - if (bits < ((((byte - 1) < 0) ? ((usqInt) 1 >> -(byte - 1)) : ((usqInt) 1 << (byte - 1))))) { - byte = (bits - (((byte < 0) ? ((usqInt) 1 >> -byte) : ((usqInt) 1 << byte)))) + 1; - goto l3; + if (bits < (1 << (byte - 1))) { + byte = (bits - (1 << byte)) + 1; + goto l7; } else { byte = bits; - goto l3; + goto l7; } - l3: /* end scaleAndSignExtend:inFieldWidth: */; + l7: /* end scaleAndSignExtend:inFieldWidth: */; if ((index < 0) || (index >= DCTSize2)) { primitiveFail(); @@ -1484,8 +1671,8 @@ static sqInt scaleAndSignExtendinFieldWidth(sqInt aNumber, sqInt w) { - if (aNumber < ((((w - 1) < 0) ? ((usqInt) 1 >> -(w - 1)) : ((usqInt) 1 << (w - 1))))) { - return (aNumber - (((w < 0) ? ((usqInt) 1 >> -w) : ((usqInt) 1 << w)))) + 1; + if (aNumber < (1 << (w - 1))) { + return (aNumber - (1 << w)) + 1; } else { return aNumber; Modified: branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2013-01-03 00:56:53 UTC (rev 2650) +++ branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2013-01-03 02:31:11 UTC (rev 2651) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 from - LargeIntegersPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + LargeIntegersPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; @@ -175,9 +175,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LargeIntegers v1.5 VMMaker.oscog-eem.235 (i)" + "LargeIntegers v1.5 VMMaker.oscog-eem.246 (i)" #else - "LargeIntegers v1.5 VMMaker.oscog-eem.235 (e)" + "LargeIntegers v1.5 VMMaker.oscog-eem.246 (e)" #endif ; static const int orOpIndex = 1; @@ -213,10 +213,10 @@ } firstByteIx = (((sqInt) (start - 1) >> 3)) + 1; lastByteIx = (((sqInt) (stop - 1) >> 3)) + 1; - rightShift = 0 - ((start - 1) % 8); + rightShift = (start - 1) % 8; leftShift = 7 - ((stop - 1) % 8); if (firstByteIx == lastByteIx) { - mask = ((((0 - rightShift) < 0) ? ((usqInt) 255 >> -(0 - rightShift)) : ((usqInt) 255 << (0 - rightShift)))) & ((((0 - leftShift) < 0) ? ((usqInt) 255 >> -(0 - leftShift)) : ((usqInt) 255 << (0 - leftShift)))); + mask = (255 << rightShift) & (((usqInt) 255) >> leftShift); /* begin digitOfBytes:at: */ if (firstByteIx > (slotSizeOf(magnitude))) { digit = 0; @@ -229,7 +229,7 @@ l1: /* end digitOfBytes:at: */; return (digit & mask) != 0; } - if ((((rightShift < 0) ? ((usqInt) (digitOfBytesat(magnitude, firstByteIx)) >> -rightShift) : ((usqInt) (digitOfBytesat(magnitude, firstByteIx)) << rightShift))) != 0) { + if ((((usqInt) (digitOfBytesat(magnitude, firstByteIx))) >> rightShift) != 0) { return 1; } for (ix = (firstByteIx + 1); ix <= (lastByteIx - 1); ix += 1) { @@ -237,7 +237,7 @@ return 1; } } - if (((((leftShift < 0) ? ((usqInt) (digitOfBytesat(magnitude, lastByteIx)) >> -leftShift) : ((usqInt) (digitOfBytesat(magnitude, lastByteIx)) << leftShift))) & 255) != 0) { + if ((((digitOfBytesat(magnitude, lastByteIx)) << leftShift) & 255) != 0) { return 1; } return 0; @@ -932,7 +932,7 @@ static sqInt cDigitOfCSIat(sqInt csi, sqInt ix) { - if (ix < 0) { + if (ix < 1) { primitiveFail(); } if (ix > 4) { @@ -940,10 +940,10 @@ } if (csi < 0) { ; - return (((((1 - ix) * 8) < 0) ? ((usqInt) (0 - csi) >> -((1 - ix) * 8)) : ((usqInt) (0 - csi) << ((1 - ix) * 8)))) & 255; + return (((usqInt) (0 - csi)) >> ((ix - 1) * 8)) & 255; } else { - return (((((1 - ix) * 8) < 0) ? ((usqInt) csi >> -((1 - ix) * 8)) : ((usqInt) csi << ((1 - ix) * 8)))) & 255; + return (((usqInt) csi) >> ((ix - 1) * 8)) & 255; } } Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-01-03 00:56:53 UTC (rev 2650) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-01-03 02:31:11 UTC (rev 2651) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 from - CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 + CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -123,6 +123,7 @@ #define ClassBlockClosure 36 #define ClassBlockClosureCompactIndex 0 #define ClassByteArray 26 +#define ClassByteString 6 #define ClassByteStringCompactIndex 11 #define ClassCharacter 19 #define ClassExternalAddress 43 @@ -143,7 +144,6 @@ #define ClassMutex 39 #define ClassPoint 12 #define ClassSemaphore 18 -#define ClassString 6 #define ClassUnsafeAlien 54 #define ClosureFirstCopiedValueIndex 3 #define ClosureIndex 4 @@ -1928,7 +1928,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.243"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.246"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -7889,7 +7889,7 @@ GIV(primFailCode) = 1; } } - shifted = ((integerArgument < 0) ? ((usqInt) integerReceiver >> -integerArgument) : ((usqInt) integerReceiver << integerArgument)); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } } if (!GIV(primFailCode)) { @@ -8360,14 +8360,14 @@ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> 12) & 31; if (ccIndex == 0) { - isString = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord))); + isString = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))); goto l122; } if (ClassByteStringCompactIndex != 0) { isString = ClassByteStringCompactIndex == ccIndex; goto l122; } - isString = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); + isString = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); l122: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l120: /* end is:instanceOf:compactClassIndex: */; if (isString) { @@ -10657,7 +10657,7 @@ GIV(primFailCode) = 1; } } - shifted = ((integerArgument < 0) ? ((usqInt) integerReceiver >> -integerArgument) : ((usqInt) integerReceiver << integerArgument)); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } } if (!GIV(primFailCode)) { @@ -11128,14 +11128,14 @@ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> 12) & 31; if (ccIndex == 0) { - isString = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord))); + isString = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))); goto l245; } if (ClassByteStringCompactIndex != 0) { isString = ClassByteStringCompactIndex == ccIndex; goto l245; } - isString = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); + isString = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); l245: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l243: /* end is:instanceOf:compactClassIndex: */; if (isString) { @@ -16637,7 +16637,7 @@ sqInt classString(void) { - return longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)); + return longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)); } sqInt @@ -17632,14 +17632,14 @@ assert(!((oop & 1))); ccIndex = (((usqInt) (longAt(oop))) >> 12) & 31; if (ccIndex == 0) { - isString = ((longAt(oop - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord))); + isString = ((longAt(oop - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))); goto l3; } if (ClassByteStringCompactIndex != 0) { isString = ClassByteStringCompactIndex == ccIndex; goto l3; } - isString = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); + isString = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); l3: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l1: /* end is:instanceOf:compactClassIndex: */; if (!isString) { @@ -30103,7 +30103,7 @@ GIV(primFailCode) = 1; } } - shifted = ((integerArgument < 0) ? ((usqInt) integerReceiver >> -integerArgument) : ((usqInt) integerReceiver << integerArgument)); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } } if (!GIV(primFailCode)) { @@ -30491,7 +30491,7 @@ } return; } - s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), sz); + s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), sz); clipboardReadIntoAt(sz, s + BaseHeaderSize, 0); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), s); @@ -35664,7 +35664,7 @@ sz = attributeSize(attr); } if (!GIV(primFailCode)) { - s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), sz); + s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), sz); getAttributeIntoLength(attr, s + BaseHeaderSize, sz); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), s); @@ -35698,7 +35698,7 @@ return null; } sz = strlen(ptr); - stringOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), sz); + stringOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), sz); for (i = 0; i <= (sz - 1); i += 1) { byteAtput((stringOop + BaseHeaderSize) + i, ptr[i]); } @@ -35822,7 +35822,7 @@ return null; } sz = strlen(ptr); - labelOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), sz); + labelOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), sz); for (i = 0; i <= (sz - 1); i += 1) { byteAtput((labelOop + BaseHeaderSize) + i, ptr[i]); } @@ -36163,7 +36163,7 @@ cl = (((ccIndex = (((usqInt) (longAt(s))) >> 12) & 31)) == 0 ? (longAt(s - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - successBoolean = cl == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord))); + successBoolean = cl == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))); l1: /* end isClassOfNonImm:equalTo: */; if (!successBoolean) { @@ -36183,7 +36183,7 @@ } else { sz = imageNameSize(); - s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), sz); + s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), sz); imageNameGetLength(s + BaseHeaderSize, sz); /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; @@ -37309,7 +37309,7 @@ return; } length = strlen(moduleName); - nameOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), length); + nameOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), length); for (i = 0; i <= (length - 1); i += 1) { byteAtput((nameOop + BaseHeaderSize) + i, moduleName[i]); } @@ -37375,7 +37375,7 @@ return; } length = strlen(moduleName); - nameOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), length); + nameOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), length); for (i = 0; i <= (length - 1); i += 1) { byteAtput((nameOop + BaseHeaderSize) + i, moduleName[i]); } @@ -43235,7 +43235,7 @@ sqInt sz; sz = vmPathSize(); - s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), sz); + s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), sz); vmPathGetLength(s + BaseHeaderSize, sz); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), s); @@ -50221,7 +50221,7 @@ sqInt newString; len = strlen(aCString); - newString = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), len); + newString = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), len); if (!(newString == null)) { strncpy(arrayValueOf(newString), aCString, len); } Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-01-03 00:56:53 UTC (rev 2650) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-01-03 02:31:11 UTC (rev 2651) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-03 00:56:53 UTC (rev 2650) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-03 02:31:11 UTC (rev 2651) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 from - CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 + CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -126,6 +126,7 @@ #define ClassBlockClosure 36 #define ClassBlockClosureCompactIndex 0 #define ClassByteArray 26 +#define ClassByteString 6 #define ClassByteStringCompactIndex 11 #define ClassCharacter 19 #define ClassExternalAddress 43 @@ -146,7 +147,6 @@ #define ClassMutex 39 #define ClassPoint 12 #define ClassSemaphore 18 -#define ClassString 6 #define ClassUnsafeAlien 54 #define ClosureFirstCopiedValueIndex 3 #define ClosureIndex 4 @@ -1931,7 +1931,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.243"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.246"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -7898,7 +7898,7 @@ GIV(primFailCode) = 1; } } - shifted = ((integerArgument < 0) ? ((usqInt) integerReceiver >> -integerArgument) : ((usqInt) integerReceiver << integerArgument)); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } } if (!GIV(primFailCode)) { @@ -8369,14 +8369,14 @@ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> 12) & 31; if (ccIndex == 0) { - isString = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord))); + isString = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))); goto l122; } if (ClassByteStringCompactIndex != 0) { isString = ClassByteStringCompactIndex == ccIndex; goto l122; } - isString = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); + isString = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); l122: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l120: /* end is:instanceOf:compactClassIndex: */; if (isString) { @@ -10666,7 +10666,7 @@ GIV(primFailCode) = 1; } } - shifted = ((integerArgument < 0) ? ((usqInt) integerReceiver >> -integerArgument) : ((usqInt) integerReceiver << integerArgument)); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } } if (!GIV(primFailCode)) { @@ -11137,14 +11137,14 @@ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> 12) & 31; if (ccIndex == 0) { - isString = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord))); + isString = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))); goto l245; } if (ClassByteStringCompactIndex != 0) { isString = ClassByteStringCompactIndex == ccIndex; goto l245; } - isString = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); + isString = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); l245: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l243: /* end is:instanceOf:compactClassIndex: */; if (isString) { @@ -16646,7 +16646,7 @@ sqInt classString(void) { - return longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)); + return longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)); } sqInt @@ -17641,14 +17641,14 @@ assert(!((oop & 1))); ccIndex = (((usqInt) (longAt(oop))) >> 12) & 31; if (ccIndex == 0) { - isString = ((longAt(oop - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord))); + isString = ((longAt(oop - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))); goto l3; } if (ClassByteStringCompactIndex != 0) { isString = ClassByteStringCompactIndex == ccIndex; goto l3; } - isString = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); + isString = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); l3: /* end isClassOfNonImm:equalTo:compactClassIndex: */; l1: /* end is:instanceOf:compactClassIndex: */; if (!isString) { @@ -30112,7 +30112,7 @@ GIV(primFailCode) = 1; } } - shifted = ((integerArgument < 0) ? ((usqInt) integerReceiver >> -integerArgument) : ((usqInt) integerReceiver << integerArgument)); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } } if (!GIV(primFailCode)) { @@ -30500,7 +30500,7 @@ } return; } - s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), sz); + s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), sz); clipboardReadIntoAt(sz, s + BaseHeaderSize, 0); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), s); @@ -35673,7 +35673,7 @@ sz = attributeSize(attr); } if (!GIV(primFailCode)) { - s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), sz); + s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), sz); getAttributeIntoLength(attr, s + BaseHeaderSize, sz); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), s); @@ -35707,7 +35707,7 @@ return null; } sz = strlen(ptr); - stringOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), sz); + stringOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), sz); for (i = 0; i <= (sz - 1); i += 1) { byteAtput((stringOop + BaseHeaderSize) + i, ptr[i]); } @@ -35831,7 +35831,7 @@ return null; } sz = strlen(ptr); - labelOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), sz); + labelOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), sz); for (i = 0; i <= (sz - 1); i += 1) { byteAtput((labelOop + BaseHeaderSize) + i, ptr[i]); } @@ -36172,7 +36172,7 @@ cl = (((ccIndex = (((usqInt) (longAt(s))) >> 12) & 31)) == 0 ? (longAt(s - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - successBoolean = cl == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord))); + successBoolean = cl == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))); l1: /* end isClassOfNonImm:equalTo: */; if (!successBoolean) { @@ -36192,7 +36192,7 @@ } else { sz = imageNameSize(); - s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), sz); + s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), sz); imageNameGetLength(s + BaseHeaderSize, sz); /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; @@ -37318,7 +37318,7 @@ return; } length = strlen(moduleName); - nameOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), length); + nameOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), length); for (i = 0; i <= (length - 1); i += 1) { byteAtput((nameOop + BaseHeaderSize) + i, moduleName[i]); } @@ -37384,7 +37384,7 @@ return; } length = strlen(moduleName); - nameOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), length); + nameOop = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), length); for (i = 0; i <= (length - 1); i += 1) { byteAtput((nameOop + BaseHeaderSize) + i, moduleName[i]); } @@ -43244,7 +43244,7 @@ sqInt sz; sz = vmPathSize(); - s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), sz); + s = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), sz); vmPathGetLength(s + BaseHeaderSize, sz); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), s); @@ -50230,7 +50230,7 @@ sqInt newString; len = strlen(aCString); - newString = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassString << ShiftForWord)), len); + newString = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), len); if (!(newString == null)) { strncpy(arrayValueOf(newString), aCString, len); } Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-01-03 00:56:53 UTC (rev 2650) +++ branches/Cog/nscogsrc/vm/interp.h 2013-01-03 02:31:11 UTC (rev 2651) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-03 00:56:53 UTC (rev 2650) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-03 02:31:11 UTC (rev 2651) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jan 2 12:19:19 PST 2013 + Wed Jan 2 18:30:24 PST 2013 Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2013-01-03 00:56:53 UTC (rev 2650) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2013-01-03 02:31:11 UTC (rev 2651) @@ -819,6 +819,9 @@ # elif __sun__ && __i386__ void *fp = (void *)(uap ? uap->uc_mcontext.gregs[REG_FP]: 0); void *sp = (void *)(uap ? uap->uc_mcontext.gregs[REG_SP]: 0); +# elif __x86_64__ +# error Currently this VM must be build as a 32-bit binary. +# error See section 3e in unixbuild/HowToBuild. # else # error need to implement extracting pc from a ucontext_t on this system # endif Modified: branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-01-03 00:56:53 UTC (rev 2650) +++ branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-01-03 02:31:11 UTC (rev 2651) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + VMPluginCodeGenerator VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 from - BMPReadWriterPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + BMPReadWriterPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; @@ -80,9 +80,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin VMMaker.oscog-eem.235 (i)" + "BMPReadWriterPlugin VMMaker.oscog-eem.246 (i)" #else - "BMPReadWriterPlugin VMMaker.oscog-eem.235 (e)" + "BMPReadWriterPlugin VMMaker.oscog-eem.246 (e)" #endif ; @@ -138,6 +138,9 @@ return primitiveFail(); } width = stackIntegerValue(0); + if (width <= 0) { + return primitiveFail(); + } formBitsIndex = stackIntegerValue(1); formBitsOop = stackObjectValue(2); pixelLineOop = stackObjectValue(3); @@ -188,6 +191,9 @@ return primitiveFail(); } width = stackIntegerValue(0); + if (width <= 0) { + return primitiveFail(); + } formBitsIndex = stackIntegerValue(1); formBitsOop = stackObjectValue(2); pixelLineOop = stackObjectValue(3); Modified: branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c =================================================================== --- branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c 2013-01-03 00:56:53 UTC (rev 2650) +++ branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c 2013-01-03 02:31:11 UTC (rev 2651) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + VMPluginCodeGenerator VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 from - FFTPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + FFTPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 */ -static char __buildInfo[] = "FFTPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "FFTPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; @@ -95,9 +95,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FFTPlugin VMMaker.oscog-eem.235 (i)" + "FFTPlugin VMMaker.oscog-eem.246 (i)" #else - "FFTPlugin VMMaker.oscog-eem.235 (e)" + "FFTPlugin VMMaker.oscog-eem.246 (e)" #endif ; static sqInt nu; @@ -319,7 +319,7 @@ fftSize2 = ((sqInt) fftSize >> 1); fftSize4 = ((sqInt) fftSize >> 2); for (level = 1; level <= nu; level += 1) { - lev = ((level < 0) ? ((usqInt) 1 >> -level) : ((usqInt) 1 << level)); + lev = 1 << level; lev1 = ((sqInt) lev >> 1); fftScale = fftSize / lev; for (j = 1; j <= lev1; j += 1) { @@ -445,7 +445,7 @@ fftSize2 = ((sqInt) fftSize >> 1); fftSize4 = ((sqInt) fftSize >> 2); for (level = 1; level <= nu; level += 1) { - lev = ((level < 0) ? ((usqInt) 1 >> -level) : ((usqInt) 1 << level)); + lev = 1 << level; lev1 = ((sqInt) lev >> 1); fftScale = fftSize / lev; for (j = 1; j <= lev1; j += 1) { @@ -508,7 +508,7 @@ fftSize2 = ((sqInt) fftSize >> 1); fftSize4 = ((sqInt) fftSize >> 2); for (level = 1; level <= nu; level += 1) { - lev = ((level < 0) ? ((usqInt) 1 >> -level) : ((usqInt) 1 << level)); + lev = 1 << level; lev1 = ((sqInt) lev >> 1); fftScale = fftSize / lev; for (j = 1; j <= lev1; j += 1) { Modified: branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-01-03 00:56:53 UTC (rev 2650) +++ branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-01-03 02:31:11 UTC (rev 2651) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + VMPluginCodeGenerator VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 from - JPEGReaderPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + JPEGReaderPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ; @@ -182,9 +182,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin VMMaker.oscog-eem.235 (i)" + "JPEGReaderPlugin VMMaker.oscog-eem.246 (i)" #else - "JPEGReaderPlugin VMMaker.oscog-eem.235 (e)" + "JPEGReaderPlugin VMMaker.oscog-eem.246 (e)" #endif ; static int *residuals; @@ -458,8 +458,12 @@ { sqInt bits; sqInt byte; + sqInt byte1; + sqInt byte2; sqInt i; sqInt index; + sqInt value; + sqInt value1; sqInt zeroCount; byte = jpegDecodeValueFromsize(dcTable, dcTableSize); @@ -467,10 +471,46 @@ return primitiveFail(); } if (byte != 0) { - bits = getBits(byte); + /* begin getBits: */ + if (byte > jsBitCount) { + /* begin fillBuffer */ + while (jsBitCount <= 16) { + if (!(jsPosition < jsReadLimit)) { + jsBitCount; + goto l3; + } + byte1 = jsCollection[jsPosition]; + jsPosition += 1; + if (byte1 == 255) { + + /* peek for 00 */ + + if (!((jsPosition < jsReadLimit) + && ((jsCollection[jsPosition]) == 0))) { + jsPosition -= 1; + jsBitCount; + goto l3; + } + jsPosition += 1; + } + jsBitBuffer = (((usqInt) jsBitBuffer << 8)) | byte1; + jsBitCount += 8; + } + jsBitCount; + l3: /* end fillBuffer */; + if (byte > jsBitCount) { + bits = -1; + goto l4; + } + } + jsBitCount -= byte; + value = ((usqInt) jsBitBuffer) >> jsBitCount; + jsBitBuffer = jsBitBuffer & ((1 << jsBitCount) - 1); + bits = value; + l4: /* end getBits: */; /* begin scaleAndSignExtend:inFieldWidth: */ - if (bits < ((((byte - 1) < 0) ? ((usqInt) 1 >> -(byte - 1)) : ((usqInt) 1 << (byte - 1))))) { - byte = (bits - (((byte < 0) ? ((usqInt) 1 >> -byte) : ((usqInt) 1 << byte)))) + 1; + if (bits < (1 << (byte - 1))) { + byte = (bits - (1 << byte)) + 1; goto l1; } else { @@ -494,10 +534,46 @@ byte = byte & 15; if (byte != 0) { index += zeroCount; - bits = getBits(byte); + /* begin getBits: */ + if (byte > jsBitCount) { + /* begin fillBuffer */ + while (jsBitCount <= 16) { + if (!(jsPosition < jsReadLimit)) { + jsBitCount; + goto l5; + } + byte2 = jsCollection[jsPosition]; + jsPosition += 1; + if (byte2 == 255) { + + /* peek for 00 */ + + if (!((jsPosition < jsReadLimit) + && ((jsCollection[jsPosition]) == 0))) { + jsPosition -= 1; + jsBitCount; + goto l5; + } + jsPosition += 1; + } + jsBitBuffer = (((usqInt) jsBitBuffer << 8)) | byte2; + jsBitCount += 8; + } + jsBitCount; + l5: /* end fillBuffer */; + if (byte > jsBitCount) { + bits = -1; + goto l6; + } + } + jsBitCount -= byte; + value1 = ((usqInt) jsBitBuffer) >> jsBitCount; + jsBitBuffer = jsBitBuffer & ((1 << jsBitCount) - 1); + bits = value1; + l6: /* end getBits: */; /* begin scaleAndSignExtend:inFieldWidth: */ - if (bits < ((((byte - 1) < 0) ? ((usqInt) 1 >> -(byte - 1)) : ((usqInt) 1 << (byte - 1))))) { - byte = (bits - (((byte < 0) ? ((usqInt) 1 >> -byte) : ((usqInt) 1 << byte)))) + 1; + if (bits < (1 << (byte - 1))) { + byte = (bits - (1 << byte)) + 1; goto l2; } else { @@ -587,9 +663,9 @@ return -1; } } - value = (((requestedBits - jsBitCount) < 0) ? ((usqInt) jsBitBuffer >> -(requestedBits - jsBitCount)) : ((usqInt) jsBitBuffer << (requestedBits - jsBitCount))); - jsBitBuffer = jsBitBuffer & (((((jsBitCount - requestedBits) < 0) ? ((usqInt) 1 >> -(jsBitCount - requestedBits)) : ((usqInt) 1 << (jsBitCount - requestedBits)))) - 1); jsBitCount -= requestedBits; + value = ((usqInt) jsBitBuffer) >> jsBitCount; + jsBitBuffer = jsBitBuffer & ((1 << jsBitCount) - 1); return value; } @@ -656,7 +732,7 @@ } } if (anACTerm == -1) { - dcval = ((usqInt) ((anArray[i]) * (qt[0])) << 2); + dcval = ((anArray[i]) * (qt[0])) << Pass1Bits; for (j = 0; j <= (DCTSize - 1); j += 1) { ws[(j * DCTSize) + i] = dcval; } @@ -669,8 +745,8 @@ t3 = z1 + (z2 * FIXn0n765366865); z2 = (anArray[i]) * (qt[i]); z3 = (anArray[(DCTSize * 4) + i]) * (qt[(DCTSize * 4) + i]); - t0 = ((usqInt) (z2 + z3) << 13); - t1 = ((usqInt) (z2 - z3) << 13); + t0 = (z2 + z3) << ConstBits; + t1 = (z2 - z3) << ConstBits; t10 = t0 + t3; t13 = t0 - t3; t11 = t1 + t2; @@ -714,8 +790,8 @@ z1 = (z2 + z3) * FIXn0n541196100; t2 = z1 + (z3 * (0 - FIXn1n847759065)); t3 = z1 + (z2 * FIXn0n765366865); - t0 = ((usqInt) ((ws[i]) + (ws[i + 4])) << 13); - t1 = ((usqInt) ((ws[i]) - (ws[i + 4])) << 13); + t0 = ((ws[i]) + (ws[i + 4])) << ConstBits; + t1 = ((ws[i]) - (ws[i + 4])) << ConstBits; t10 = t0 + t3; t13 = t0 - t3; t11 = t1 + t2; @@ -786,9 +862,11 @@ { sqInt bits; sqInt bitsNeeded; + sqInt byte; sqInt index; sqInt tableIndex; sqInt value; + sqInt value1; @@ Diff output truncated at 50000 characters. @@

1 0

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

03 Jan '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.246.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.246 Author: eem Time: 2 January 2013, 5:53:50.542 pm UUID: 1e176c89-522a-4632-ba15-e12f800d1022 Ancestors: VMMaker.oscog-eem.245 Integrate changes from VMMaker-dtl.293 which use >> & << shifts in place of slower bitShift: code in plugins. =============== Diff against VMMaker.oscog-eem.245 =============== Item was changed: ----- Method: DeflatePlugin>>nextZipBits:put: (in category 'encoding') ----- nextZipBits: nBits put: value "Require: zipCollection, zipCollectionSize, zipPosition, zipBitBuf, zipBitPos. " <inline: true> (value >= 0 and:[(1 << nBits) > value]) ifFalse:[^interpreterProxy primitiveFail]. + zipBitBuf := zipBitBuf bitOr: value << zipBitPos. - zipBitBuf := zipBitBuf bitOr: (value bitShift: zipBitPos). zipBitPos := zipBitPos + nBits. [zipBitPos >= 8 and:[zipPosition < zipCollectionSize]] whileTrue:[ zipCollection at: zipPosition put: (zipBitBuf bitAnd: 255). zipPosition := zipPosition + 1. zipBitBuf := zipBitBuf >> 8. zipBitPos := zipBitPos - 8]. ! Item was changed: ----- Method: DeflatePlugin>>updateHash: (in category 'deflating') ----- updateHash: nextValue "Update the running hash value based on the next input byte. Return the new updated hash value." + ^((zipHashValue << DeflateHashShift) bitXor: nextValue) bitAnd: DeflateHashMask.! - ^((zipHashValue bitShift: DeflateHashShift) bitXor: nextValue) bitAnd: DeflateHashMask.! Item was changed: ----- Method: FFTPlugin>>transformForward: (in category 'transforming') ----- transformForward: forward | lev lev1 ip theta realU imagU realT imagT i fftSize2 fftSize4 fftScale ii | <var: #realU type:'float '> <var: #realT type:'float '> <var: #imagU type:'float '> <var: #imagT type:'float '> fftSize2 := fftSize // 2. fftSize4 := fftSize // 4. 1 to: nu do: [:level | + lev := 1 << level. - lev := 1 bitShift: level. lev1 := lev // 2. fftScale := fftSize // lev. 1 to: lev1 do: [:j | theta := j-1 * fftScale. "pi * (j-1) / lev1 mapped onto 0..n/2" theta < fftSize4 "Compute U, the complex multiplier for each level" ifTrue: [realU := sinTable at: sinTableSize - theta - 1. imagU := sinTable at: theta] ifFalse: [realU := 0.0 - (sinTable at: theta - fftSize4). imagU := sinTable at: fftSize2 - theta]. forward ifFalse: [imagU := 0.0 - imagU]. " Here is the inner loop... j to: n by: lev do: [:i | hand-transformed to whileTrue... " i := j. [i <= fftSize] whileTrue: [ip := i + lev1 - 1. ii := i-1. realT := ((realData at: ip) * realU) - ((imagData at: ip) * imagU). imagT := ((realData at: ip) * imagU) + ((imagData at: ip) * realU). realData at: ip put: (realData at: ii) - realT. imagData at: ip put: (imagData at: ii) - imagT. realData at: ii put: (realData at: ii) + realT. imagData at: ii put: (imagData at: ii) + imagT. i := i + lev]]].! Item was changed: ----- Method: JPEGReaderPlugin>>getBits: (in category 'stream support') ----- getBits: requestedBits | value | requestedBits > jsBitCount ifTrue:[ self fillBuffer. requestedBits > jsBitCount ifTrue:[^-1]]. - value := jsBitBuffer bitShift: (requestedBits - jsBitCount). - jsBitBuffer := jsBitBuffer bitAnd: (1 bitShift: (jsBitCount - requestedBits)) -1. jsBitCount := jsBitCount - requestedBits. + value := jsBitBuffer >> jsBitCount. + jsBitBuffer := jsBitBuffer bitAnd: (1 << jsBitCount) -1. ^ value! Item was changed: ----- Method: JPEGReaderPlugin>>idctBlockInt:qt: (in category 'decoding') ----- idctBlockInt: anArray qt: qt | ws anACTerm dcval z2 z3 z1 t2 t3 t0 t1 t10 t13 t11 t12 z4 z5 v | <var: #anArray type: 'int *'> <var: #qt type: 'int *'> <var: #ws declareC: 'int ws[64]'> self cCode:'' inSmalltalk:[ws := CArrayAccessor on: (IntegerArray new: 64)]. "Pass 1: process columns from anArray, store into work array" 0 to: DCTSize-1 do:[:i | anACTerm := -1. 1 to: DCTSize-1 do:[:row| anACTerm = -1 ifTrue:[ (anArray at: row * DCTSize + i) = 0 ifFalse:[anACTerm := row]]]. anACTerm = -1 ifTrue:[ + dcval := (anArray at: i) * (qt at: 0) << Pass1Bits. - dcval := (anArray at: i) * (qt at: 0) bitShift: Pass1Bits. 0 to: DCTSize-1 do: [:j | ws at: (j * DCTSize + i) put: dcval] ] ifFalse:[ z2 := (anArray at: (DCTSize * 2 + i)) * (qt at: (DCTSize * 2 + i)). z3 := (anArray at: (DCTSize * 6 + i)) * (qt at: (DCTSize * 6 + i)). z1 := (z2 + z3) * FIXn0n541196100. t2 := z1 + (z3 * (0 - FIXn1n847759065)). t3 := z1 + (z2 * FIXn0n765366865). z2 := (anArray at: i) * (qt at: i). z3 := (anArray at: (DCTSize * 4 + i)) * (qt at: (DCTSize * 4 + i)). + t0 := (z2 + z3) << ConstBits. + t1 := (z2 - z3) << ConstBits. - t0 := (z2 + z3) bitShift: ConstBits. - t1 := (z2 - z3) bitShift: ConstBits. t10 := t0 + t3. t13 := t0 - t3. t11 := t1 + t2. t12 := t1 - t2. t0 := (anArray at: (DCTSize * 7 + i)) * (qt at: (DCTSize * 7 + i)). t1 := (anArray at: (DCTSize * 5 + i)) * (qt at: (DCTSize * 5 + i)). t2 := (anArray at: (DCTSize * 3 + i)) * (qt at: (DCTSize * 3 + i)). t3 := (anArray at: (DCTSize + i)) * (qt at: (DCTSize + i)). z1 := t0 + t3. z2 := t1 + t2. z3 := t0 + t2. z4 := t1 + t3. z5 := (z3 + z4) * FIXn1n175875602. t0 := t0 * FIXn0n298631336. t1 := t1 * FIXn2n053119869. t2 := t2 * FIXn3n072711026. t3 := t3 * FIXn1n501321110. z1 := z1 * (0 - FIXn0n899976223). z2 := z2 * (0 - FIXn2n562915447). z3 := z3 * (0 - FIXn1n961570560). z4 := z4 * (0 - FIXn0n390180644). z3 := z3 + z5. z4 := z4 + z5. t0 := t0 + z1 + z3. t1 := t1 +z2 +z4. t2 := t2 + z2 + z3. t3 := t3 + z1 + z4. ws at: i put: (t10 + t3) // Pass1Div. ws at: (DCTSize * 7 + i) put: (t10 - t3) // Pass1Div. ws at: (DCTSize * 1 + i) put: (t11 + t2) // Pass1Div. ws at: (DCTSize * 6 + i) put: (t11 - t2) // Pass1Div. ws at: (DCTSize * 2 + i) put: (t12 + t1) // Pass1Div. ws at: (DCTSize * 5 + i) put: (t12 - t1) // Pass1Div. ws at: (DCTSize * 3 + i) put: (t13 + t0) // Pass1Div. ws at: (DCTSize * 4 + i) put: (t13 - t0) // Pass1Div]]. "Pass 2: process rows from work array, store back into anArray" 0 to: DCTSize2-DCTSize by: DCTSize do:[:i | z2 := ws at: i + 2. z3 := ws at: i + 6. z1 := (z2 + z3) * FIXn0n541196100. t2 := z1 + (z3 * (0-FIXn1n847759065)). t3 := z1 + (z2 * FIXn0n765366865). + t0 := (ws at: i) + (ws at: (i + 4)) << ConstBits. + t1 := (ws at: i) - (ws at: (i + 4)) << ConstBits. - t0 := (ws at: i) + (ws at: (i + 4)) bitShift: ConstBits. - t1 := (ws at: i) - (ws at: (i + 4)) bitShift: ConstBits. t10 := t0 + t3. t13 := t0 - t3. t11 := t1 + t2. t12 := t1 -t2. t0 := ws at: (i + 7). t1 := ws at: (i + 5). t2 := ws at: (i + 3). t3 := ws at: (i + 1). z1 := t0 + t3. z2 := t1 + t2. z3 := t0 + t2. z4 := t1 + t3. z5 := (z3 + z4) * FIXn1n175875602. t0 := t0 * FIXn0n298631336. t1 := t1 * FIXn2n053119869. t2 := t2 * FIXn3n072711026. t3 := t3 * FIXn1n501321110. z1 := z1 * (0-FIXn0n899976223). z2 := z2 * (0-FIXn2n562915447). z3 := z3 * (0-FIXn1n961570560). z4 := z4 * (0-FIXn0n390180644). z3 := z3 + z5. z4 := z4 + z5. t0 := t0 + z1 + z3. t1 := t1 + z2 + z4. t2 := t2 + z2 + z3. t3 := t3 + z1 + z4. v := (t10 + t3) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: i put: v. v := (t10 - t3) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 7) put: v. v := (t11 + t2) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 1) put: v. v := (t11 - t2) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 6) put: v. v := (t12 + t1) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 2) put: v. v := (t12 - t1) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 5) put: v. v := (t13 + t0) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 3) put: v. v := (t13 - t0) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 4) put: v].! Item was changed: ----- Method: JPEGReaderPlugin>>scaleAndSignExtend:inFieldWidth: (in category 'decoding') ----- scaleAndSignExtend: aNumber inFieldWidth: w <inline: true> + aNumber < (1 << (w - 1)) + ifTrue: [^aNumber - (1 << w) + 1] - aNumber < (1 bitShift: (w - 1)) - ifTrue: [^aNumber - (1 bitShift: w) + 1] ifFalse: [^aNumber]! Item was changed: ----- Method: LargeIntegersPlugin>>anyBitOfBytes:from:to: (in category 'util') ----- anyBitOfBytes: aBytesOop from: start to: stopArg "Argument has to be aBytesOop!!" "Tests for any magnitude bits in the interval from start to stopArg." | magnitude rightShift leftShift stop firstByteIx lastByteIx | self debugCode: [self msg: 'anyBitOfBytes: aBytesOop from: start to: stopArg']. start < 1 | (stopArg < 1) ifTrue: [^ interpreterProxy primitiveFail]. magnitude := aBytesOop. stop := stopArg min: (self highBitOfBytes: magnitude). start > stop ifTrue: [^ false]. firstByteIx := start - 1 // 8 + 1. lastByteIx := stop - 1 // 8 + 1. + rightShift := (start - 1 \\ 8). - rightShift := 0 - (start - 1 \\ 8). leftShift := 7 - (stop - 1 \\ 8). firstByteIx = lastByteIx ifTrue: [| digit mask | + mask := (255 << rightShift) bitAnd: (255 >> leftShift). - mask := (255 bitShift: 0 - rightShift) - bitAnd: (255 bitShift: 0 - leftShift). digit := self digitOfBytes: magnitude at: firstByteIx. ^ (digit bitAnd: mask) ~= 0]. ((self digitOfBytes: magnitude at: firstByteIx) + >> rightShift) - bitShift: rightShift) ~= 0 ifTrue: [^ true]. firstByteIx + 1 to: lastByteIx - 1 do: [:ix | (self digitOfBytes: magnitude at: ix) ~= 0 ifTrue: [^ true]]. (((self digitOfBytes: magnitude at: lastByteIx) + << leftShift) - bitShift: leftShift) bitAnd: 255) ~= 0 ifTrue: [^ true]. ^ false! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitOfCSI:at: (in category 'C core util') ----- cDigitOfCSI: csi at: ix "Answer the value of an indexable field in the receiver. LargePositiveInteger uses bytes of base two number, and each is a 'digit' base 256." "ST indexed!!" + ix < 1 ifTrue: [interpreterProxy primitiveFail]. - ix < 0 ifTrue: [interpreterProxy primitiveFail]. ix > 4 ifTrue: [^ 0]. csi < 0 ifTrue: [self cCode: '' inSmalltalk: [csi = -1073741824 ifTrue: ["SmallInteger minVal" "Can't negate minVal -- treat specially" ^ #(0 0 0 64 ) at: ix]]. + ^ (0 - csi) >> (ix - 1 * 8) - ^ (0 - csi bitShift: 1 - ix * 8) bitAnd: 255] + ifFalse: [^ csi >> (ix - 1 * 8) - ifFalse: [^ (csi bitShift: 1 - ix * 8) bitAnd: 255]!

1 0

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

03 Jan '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.245.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.245 Author: eem Time: 2 January 2013, 5:44:32.298 pm UUID: 3b27b42f-4c48-40b7-8261-2f05e76d11f2 Ancestors: VMMaker.oscog-eem.244 Add width failure cases to BMPReadWriterPlugin read & write 24Bmp prims. Use ClassByteString var in preference to ClassString var. =============== Diff against VMMaker.oscog-eem.244 =============== Item was changed: ----- Method: BMPReadWriterPlugin>>primitiveRead24BmpLine (in category 'primitives') ----- primitiveRead24BmpLine | width formBitsIndex formBitsOop pixelLineOop formBitsSize formBits pixelLineSize pixelLine | <export: true> <inline: false> <var: #formBits type: 'unsigned int *'> <var: #pixelLine type: 'unsigned char *'> interpreterProxy methodArgumentCount = 4 ifFalse:[^interpreterProxy primitiveFail]. width := interpreterProxy stackIntegerValue: 0. + width <= 0 ifTrue:[^interpreterProxy primitiveFail]. formBitsIndex := interpreterProxy stackIntegerValue: 1. formBitsOop := interpreterProxy stackObjectValue: 2. pixelLineOop := interpreterProxy stackObjectValue: 3. interpreterProxy failed ifTrue:[^nil]. (interpreterProxy isWords: formBitsOop) ifFalse:[^interpreterProxy primitiveFail]. (interpreterProxy isBytes: pixelLineOop) ifFalse:[^interpreterProxy primitiveFail]. formBitsSize := interpreterProxy slotSizeOf: formBitsOop. formBits := interpreterProxy firstIndexableField: formBitsOop. pixelLineSize := interpreterProxy slotSizeOf: pixelLineOop. pixelLine := interpreterProxy firstIndexableField: pixelLineOop. (formBitsIndex + width <= formBitsSize and:[width*3 <= pixelLineSize]) ifFalse:[^interpreterProxy primitiveFail]. "do the actual work" self cCode:' formBits += formBitsIndex-1; while(width--) { unsigned int rgb; rgb = (*pixelLine++); rgb += (*pixelLine++) << 8; rgb += (*pixelLine++) << 16; if(rgb) rgb |= 0xFF000000; else rgb |= 0xFF000001; *formBits++ = rgb; } ' inSmalltalk:[formBits. pixelLine. ^interpreterProxy primitiveFail]. interpreterProxy pop: 4. "args" ! Item was changed: ----- Method: BMPReadWriterPlugin>>primitiveWrite24BmpLine (in category 'primitives') ----- primitiveWrite24BmpLine | width formBitsIndex formBitsOop pixelLineOop formBitsSize formBits pixelLineSize pixelLine | <export: true> <inline: false> <var: #formBits type: 'unsigned int *'> <var: #pixelLine type: 'unsigned char *'> interpreterProxy methodArgumentCount = 4 ifFalse:[^interpreterProxy primitiveFail]. width := interpreterProxy stackIntegerValue: 0. + width <= 0 ifTrue:[^interpreterProxy primitiveFail]. formBitsIndex := interpreterProxy stackIntegerValue: 1. formBitsOop := interpreterProxy stackObjectValue: 2. pixelLineOop := interpreterProxy stackObjectValue: 3. interpreterProxy failed ifTrue:[^nil]. (interpreterProxy isWords: formBitsOop) ifFalse:[^interpreterProxy primitiveFail]. (interpreterProxy isBytes: pixelLineOop) ifFalse:[^interpreterProxy primitiveFail]. formBitsSize := interpreterProxy slotSizeOf: formBitsOop. formBits := interpreterProxy firstIndexableField: formBitsOop. pixelLineSize := interpreterProxy slotSizeOf: pixelLineOop. pixelLine := interpreterProxy firstIndexableField: pixelLineOop. (formBitsIndex + width <= formBitsSize and:[width*3 <= pixelLineSize]) ifFalse:[^interpreterProxy primitiveFail]. "do the actual work. Read 32 bit at a time from formBits, and store the low order 24 bits or each word into pixelLine in little endian order." self cCode:' formBits += formBitsIndex-1; while(width--) { unsigned int rgb; rgb = *formBits++; (*pixelLine++) = (rgb ) & 0xFF; (*pixelLine++) = (rgb >> 8 ) & 0xFF; (*pixelLine++) = (rgb >> 16) & 0xFF; } ' inSmalltalk:[formBits. pixelLine. ^interpreterProxy primitiveFail]. interpreterProxy pop: 4. "args" ! Item was changed: ----- Method: CogVMSimulator>>makeDirEntryName:size:createDate:modDate:isDir:fileSize: (in category 'file primitives') ----- makeDirEntryName: entryName size: entryNameSize createDate: createDate modDate: modifiedDate isDir: dirFlag fileSize: fileSize | modDateOop createDateOop nameString results | <var: 'entryName' type: 'char *'> results := objectMemory instantiateClass: (objectMemory splObj: ClassArray) indexableSize: 5. + nameString := objectMemory instantiateClass: (objectMemory splObj: ClassByteString) indexableSize: entryNameSize. - nameString := objectMemory instantiateClass: (objectMemory splObj: ClassString) indexableSize: entryNameSize. createDateOop := self positive32BitIntegerFor: createDate. modDateOop := self positive32BitIntegerFor: modifiedDate. 1 to: entryNameSize do: [ :i | objectMemory storeByte: i-1 ofObject: nameString withValue: (entryName at: i) asciiValue]. objectMemory storePointerUnchecked: 0 ofObject: results withValue: nameString. objectMemory storePointerUnchecked: 1 ofObject: results withValue: createDateOop. objectMemory storePointerUnchecked: 2 ofObject: results withValue: modDateOop. dirFlag ifTrue: [ objectMemory storePointerUnchecked: 3 ofObject: results withValue: objectMemory trueObject ] ifFalse: [ objectMemory storePointerUnchecked: 3 ofObject: results withValue: objectMemory falseObject ]. objectMemory storePointerUnchecked: 4 ofObject: results withValue: (objectMemory integerObjectOf: fileSize). ^ results! Item was changed: ----- Method: CogVMSimulator>>primitiveGetAttribute (in category 'other primitives') ----- primitiveGetAttribute "Fetch the system attribute with the given integer ID. The result is a string, which will be empty if the attribute is not defined." | index s attribute | index := self stackIntegerValue: 0. self successful ifTrue: [ attribute := systemAttributes at: index ifAbsent: [Smalltalk getSystemAttribute: index]. attribute ifNil: [ ^self primitiveFail ]. + s := objectMemory instantiateClass: (objectMemory splObj: ClassByteString) indexableSize: attribute size. - s := objectMemory instantiateClass: (objectMemory splObj: ClassString) indexableSize: attribute size. 1 to: attribute size do: [ :i | objectMemory storeByte: i-1 ofObject: s withValue: (attribute at: i) asciiValue]. self pop: 2. "rcvr, attr" self push: s]! Item was changed: ----- Method: CogVMSimulator>>primitiveImageName (in category 'file primitives') ----- primitiveImageName "Note: For now, this only implements getting, not setting, the image file name." | result imageNameSize | self pop: 1. imageNameSize := imageName size. + result := objectMemory instantiateClass: (objectMemory splObj: ClassByteString) - result := objectMemory instantiateClass: (objectMemory splObj: ClassString) indexableSize: imageNameSize. 1 to: imageNameSize do: [:i | objectMemory storeByte: i-1 ofObject: result withValue: (imageName at: i) asciiValue]. self push: result.! Item was changed: ----- Method: Interpreter>>primitiveClipboardText (in category 'I/O primitives') ----- primitiveClipboardText "When called with a single string argument, post the string to the clipboard. When called with zero arguments, return a string containing the current clipboard contents." | s sz | argumentCount = 1 ifTrue: [s := self stackTop. (self isBytes: s) ifFalse: [^ self primitiveFail]. successFlag ifTrue: [sz := self stSizeOf: s. self clipboardWrite: sz From: s + BaseHeaderSize At: 0. self pop: 1]] ifFalse: [sz := self clipboardSize. (self sufficientSpaceToAllocate: sz) ifFalse:[^self primitiveFail]. + s := self instantiateClass: (self splObj: ClassByteString) indexableSize: sz. - s := self instantiateClass: (self splObj: ClassString) indexableSize: sz. self clipboardRead: sz Into: s + BaseHeaderSize At: 0. self pop: 1 thenPush: s]! Item was changed: ----- Method: Interpreter>>primitiveGetAttribute (in category 'system control primitives') ----- primitiveGetAttribute "Fetch the system attribute with the given integer ID. The result is a string, which will be empty if the attribute is not defined." | attr sz s | attr := self stackIntegerValue: 0. successFlag ifTrue: [sz := self attributeSize: attr]. successFlag ifTrue: [s := self + instantiateClass: (self splObj: ClassByteString) - instantiateClass: (self splObj: ClassString) indexableSize: sz. self getAttribute: attr Into: s + BaseHeaderSize Length: sz. self pop: 2 thenPush: s]! Item was changed: ----- Method: Interpreter>>primitiveImageName (in category 'other primitives') ----- primitiveImageName "When called with a single string argument, record the string as the current image file name. When called with zero arguments, return a string containing the current image file name." | s sz sCRIfn okToRename | <var: #sCRIfn type: 'void *'> argumentCount = 1 ifTrue: [ "If the security plugin can be loaded, use it to check for rename permission. If not, assume it's ok" sCRIfn := self ioLoadFunction: 'secCanRenameImage' From: 'SecurityPlugin'. sCRIfn ~= 0 ifTrue:[okToRename := self cCode:' ((sqInt (*)(void))sCRIfn)()'. okToRename ifFalse:[^self primitiveFail]]. s := self stackTop. + self assertClassOf: s is: (self splObj: ClassByteString). - self assertClassOf: s is: (self splObj: ClassString). successFlag ifTrue: [ sz := self stSizeOf: s. self imageNamePut: (s + BaseHeaderSize) Length: sz. self pop: 1. "pop s, leave rcvr on stack" ]. ] ifFalse: [ sz := self imageNameSize. + s := self instantiateClass: (self splObj: ClassByteString) indexableSize: sz. - s := self instantiateClass: (self splObj: ClassString) indexableSize: sz. self imageNameGet: (s + BaseHeaderSize) Length: sz. self pop: 1. "rcvr" self push: s. ]. ! Item was changed: ----- Method: Interpreter>>primitiveVMPath (in category 'system control primitives') ----- primitiveVMPath "Return a string containing the path name of VM's directory." | s sz | sz := self vmPathSize. + s := self instantiateClass: (self splObj: ClassByteString) indexableSize: sz. - s := self instantiateClass: (self splObj: ClassString) indexableSize: sz. self vmPathGet: (s + BaseHeaderSize) Length: sz. self pop: 1 thenPush: s. ! Item was changed: ----- Method: InterpreterPrimitives>>isInstanceOfClassByteString: (in category 'primitive support') ----- isInstanceOfClassByteString: oop <inline: true> "N.B. Because Slang always inlines is:instanceOf:compactClassIndex: (because is:instanceOf:compactClassIndex: has an inline: pragma) the + phrase (objectMemory splObj: ClassByteString) is expanded in-place and - phrase (objectMemory splObj: ClassString) is expanded in-place and is _not_ evaluated if oop has a non-zero CompactClassIndex." ^objectMemory is: oop + instanceOf: (objectMemory splObj: ClassByteString) - instanceOf: (objectMemory splObj: ClassString) compactClassIndex: ClassByteStringCompactIndex! Item was changed: ----- Method: InterpreterPrimitives>>primitiveBitShift (in category 'arithmetic integer primitives') ----- primitiveBitShift | integerReceiver integerArgument shifted | integerArgument := self popInteger. integerReceiver := self popPos32BitInteger. self successful ifTrue: [ integerArgument >= 0 ifTrue: [ "Left shift -- must fail if we lose bits beyond 32" self success: integerArgument <= 31. shifted := integerReceiver << integerArgument. self success: (shifted >> integerArgument) = integerReceiver. ] ifFalse: [ "Right shift -- OK to lose bits" self success: integerArgument >= -31. + shifted := integerReceiver >> (0 - integerArgument). - shifted := integerReceiver bitShift: integerArgument. ]. ]. self successful ifTrue: [self push: (self positive32BitIntegerFor: shifted)] ifFalse: [self unPop: 2]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveClipboardText (in category 'I/O primitives') ----- primitiveClipboardText "When called with a single string argument, post the string to the clipboard. When called with zero arguments, return a string containing the current clipboard contents." | s sz | argumentCount = 1 ifTrue: [s := self stackTop. (objectMemory isBytes: s) ifFalse: [^ self primitiveFail]. self successful ifTrue: [sz := self stSizeOf: s. self clipboardWrite: sz From: s + BaseHeaderSize At: 0. self pop: 1]] ifFalse: [sz := self clipboardSize. (objectMemory sufficientSpaceToAllocate: sz) ifFalse:[^self primitiveFail]. + s := objectMemory instantiateClass: (objectMemory splObj: ClassByteString) indexableSize: sz. - s := objectMemory instantiateClass: (objectMemory splObj: ClassString) indexableSize: sz. self clipboardRead: sz Into: s + BaseHeaderSize At: 0. self pop: 1 thenPush: s]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveGetAttribute (in category 'system control primitives') ----- primitiveGetAttribute "Fetch the system attribute with the given integer ID. The result is a string, which will be empty if the attribute is not defined." | attr sz s | attr := self stackIntegerValue: 0. self successful ifTrue: [sz := self attributeSize: attr]. self successful ifTrue: [s := objectMemory + instantiateClass: (objectMemory splObj: ClassByteString) - instantiateClass: (objectMemory splObj: ClassString) indexableSize: sz. self getAttribute: attr Into: s + BaseHeaderSize Length: sz. self pop: 2 thenPush: s]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveImageName (in category 'other primitives') ----- primitiveImageName "When called with a single string argument, record the string as the current image file name. When called with zero arguments, return a string containing the current image file name." | s sz sCRIfn okToRename | <var: #sCRIfn type: 'void *'> argumentCount = 1 ifTrue: [ "If the security plugin can be loaded, use it to check for rename permission. If not, assume it's ok" sCRIfn := self ioLoadFunction: 'secCanRenameImage' From: 'SecurityPlugin'. sCRIfn ~= 0 ifTrue:[okToRename := self cCode:' ((sqInt (*)(void))sCRIfn)()'. okToRename ifFalse:[^self primitiveFail]]. s := self stackTop. + self assertClassOf: s is: (objectMemory splObj: ClassByteString). - self assertClassOf: s is: (objectMemory splObj: ClassString). self successful ifTrue: [ sz := self stSizeOf: s. self imageNamePut: (s + BaseHeaderSize) Length: sz. self pop: 1. "pop s, leave rcvr on stack" ]. ] ifFalse: [ sz := self imageNameSize. + s := objectMemory instantiateClass: (objectMemory splObj: ClassByteString) indexableSize: sz. - s := objectMemory instantiateClass: (objectMemory splObj: ClassString) indexableSize: sz. self imageNameGet: (s + BaseHeaderSize) Length: sz. self pop: 1. "rcvr" self push: s. ]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveVMPath (in category 'system control primitives') ----- primitiveVMPath "Return a string containing the path name of VM's directory." | s sz | sz := self vmPathSize. + s := objectMemory instantiateClass: (objectMemory splObj: ClassByteString) indexableSize: sz. - s := objectMemory instantiateClass: (objectMemory splObj: ClassString) indexableSize: sz. self vmPathGet: (s + BaseHeaderSize) Length: sz. self pop: 1 thenPush: s. ! Item was changed: ----- Method: InterpreterSimulator>>makeDirEntryName:size:createDate:modDate:isDir:fileSize: (in category 'file primitives') ----- makeDirEntryName: entryName size: entryNameSize createDate: createDate modDate: modifiedDate isDir: dirFlag fileSize: fileSize | modDateOop createDateOop nameString results | <var: 'entryName' type: 'char *'> "allocate storage for results, remapping newly allocated oops in case GC happens during allocation" self pushRemappableOop: (self instantiateClass: (self splObj: ClassArray) indexableSize: 5). self pushRemappableOop: + (self instantiateClass: (self splObj: ClassByteString) indexableSize: entryNameSize).. - (self instantiateClass: (self splObj: ClassString) indexableSize: entryNameSize).. self pushRemappableOop: (self positive32BitIntegerFor: createDate). self pushRemappableOop: (self positive32BitIntegerFor: modifiedDate). modDateOop := self popRemappableOop. createDateOop := self popRemappableOop. nameString := self popRemappableOop. results := self popRemappableOop. 1 to: entryNameSize do: [ :i | self storeByte: i-1 ofObject: nameString withValue: (entryName at: i) asciiValue. ]. self storePointer: 0 ofObject: results withValue: nameString. self storePointer: 1 ofObject: results withValue: createDateOop. self storePointer: 2 ofObject: results withValue: modDateOop. dirFlag ifTrue: [ self storePointer: 3 ofObject: results withValue: trueObj ] ifFalse: [ self storePointer: 3 ofObject: results withValue: falseObj ]. self storePointer: 4 ofObject: results withValue: (self integerObjectOf: fileSize). ^ results ! Item was changed: ----- Method: InterpreterSimulator>>primitiveGetAttribute (in category 'other primitives') ----- primitiveGetAttribute "Fetch the system attribute with the given integer ID. The result is a string, which will be empty if the attribute is not defined." | attr s attribute | attr := self stackIntegerValue: 0. successFlag ifTrue: [ attribute := Smalltalk getSystemAttribute: attr. attribute ifNil: [ ^self primitiveFail ]. + s := self instantiateClass: (self splObj: ClassByteString) indexableSize: attribute size. - s := self instantiateClass: (self splObj: ClassString) indexableSize: attribute size. 1 to: attribute size do: [ :i | self storeByte: i-1 ofObject: s withValue: (attribute at: i) asciiValue]. self pop: 2. "rcvr, attr" self push: s]. ! Item was changed: ----- Method: InterpreterSimulator>>primitiveImageName (in category 'file primitives') ----- primitiveImageName "Note: For now, this only implements getting, not setting, the image file name." | result imageNameSize | self pop: 1. imageNameSize := imageName size. + result := self instantiateClass: (self splObj: ClassByteString) - result := self instantiateClass: (self splObj: ClassString) indexableSize: imageNameSize. 1 to: imageNameSize do: [:i | self storeByte: i-1 ofObject: result withValue: (imageName at: i) asciiValue]. self push: result.! Item was changed: ----- Method: NewspeakInterpreter>>primitiveClipboardText (in category 'I/O primitives') ----- primitiveClipboardText "When called with a single string argument, post the string to the clipboard. When called with zero arguments, return a string containing the current clipboard contents." | s sz | argumentCount = 1 ifTrue: [s := self stackTop. (self isBytes: s) ifFalse: [^ self primitiveFail]. self successful ifTrue: [sz := self stSizeOf: s. self clipboardWrite: sz From: s + BaseHeaderSize At: 0. self pop: 1]] ifFalse: [sz := self clipboardSize. (self sufficientSpaceToAllocate: sz) ifFalse:[^self primitiveFail]. + s := self instantiateClass: (self splObj: ClassByteString) indexableSize: sz. - s := self instantiateClass: (self splObj: ClassString) indexableSize: sz. self clipboardRead: sz Into: s + BaseHeaderSize At: 0. self pop: 1 thenPush: s]! Item was changed: ----- Method: NewspeakInterpreter>>primitiveGetAttribute (in category 'system control primitives') ----- primitiveGetAttribute "Fetch the system attribute with the given integer ID. The result is a string, which will be empty if the attribute is not defined." | attr sz s | attr := self stackIntegerValue: 0. self successful ifTrue: [sz := self attributeSize: attr]. self successful ifTrue: [s := self + instantiateClass: (self splObj: ClassByteString) - instantiateClass: (self splObj: ClassString) indexableSize: sz. self getAttribute: attr Into: s + BaseHeaderSize Length: sz. self pop: 2 thenPush: s]! Item was changed: ----- Method: NewspeakInterpreter>>primitiveImageName (in category 'other primitives') ----- primitiveImageName "When called with a single string argument, record the string as the current image file name. When called with zero arguments, return a string containing the current image file name." | s sz sCRIfn okToRename | <var: #sCRIfn type: 'void *'> argumentCount = 1 ifTrue: [ "If the security plugin can be loaded, use it to check for rename permission. If not, assume it's ok" sCRIfn := self ioLoadFunction: 'secCanRenameImage' From: 'SecurityPlugin'. sCRIfn ~= 0 ifTrue:[okToRename := self cCode:' ((sqInt (*)(void))sCRIfn)()'. okToRename ifFalse:[^self primitiveFail]]. s := self stackTop. + self assertClassOf: s is: (self splObj: ClassByteString). - self assertClassOf: s is: (self splObj: ClassString). self successful ifTrue: [ sz := self stSizeOf: s. self imageNamePut: (s + BaseHeaderSize) Length: sz. self pop: 1. "pop s, leave rcvr on stack" ]. ] ifFalse: [ sz := self imageNameSize. + s := self instantiateClass: (self splObj: ClassByteString) indexableSize: sz. - s := self instantiateClass: (self splObj: ClassString) indexableSize: sz. self imageNameGet: (s + BaseHeaderSize) Length: sz. self pop: 1. "rcvr" self push: s. ]. ! Item was changed: ----- Method: NewspeakInterpreter>>primitiveVMPath (in category 'system control primitives') ----- primitiveVMPath "Return a string containing the path name of VM's directory." | s sz | sz := self vmPathSize. + s := self instantiateClass: (self splObj: ClassByteString) indexableSize: sz. - s := self instantiateClass: (self splObj: ClassString) indexableSize: sz. self vmPathGet: (s + BaseHeaderSize) Length: sz. self pop: 1 thenPush: s. ! Item was changed: ----- Method: NewspeakInterpreterSimulator>>makeDirEntryName:size:createDate:modDate:isDir:fileSize: (in category 'file primitives') ----- makeDirEntryName: entryName size: entryNameSize createDate: createDate modDate: modifiedDate isDir: dirFlag fileSize: fileSize | modDateOop createDateOop nameString results | <var: 'entryName' type: 'char *'> "allocate storage for results, remapping newly allocated oops in case GC happens during allocation" self pushRemappableOop: (self instantiateClass: (self splObj: ClassArray) indexableSize: 5). self pushRemappableOop: + (self instantiateClass: (self splObj: ClassByteString) indexableSize: entryNameSize).. - (self instantiateClass: (self splObj: ClassString) indexableSize: entryNameSize).. self pushRemappableOop: (self positive32BitIntegerFor: createDate). self pushRemappableOop: (self positive32BitIntegerFor: modifiedDate). modDateOop := self popRemappableOop. createDateOop := self popRemappableOop. nameString := self popRemappableOop. results := self popRemappableOop. 1 to: entryNameSize do: [ :i | self storeByte: i-1 ofObject: nameString withValue: (entryName at: i) asciiValue. ]. self storePointer: 0 ofObject: results withValue: nameString. self storePointer: 1 ofObject: results withValue: createDateOop. self storePointer: 2 ofObject: results withValue: modDateOop. dirFlag ifTrue: [ self storePointer: 3 ofObject: results withValue: trueObj ] ifFalse: [ self storePointer: 3 ofObject: results withValue: falseObj ]. self storePointer: 4 ofObject: results withValue: (self integerObjectOf: fileSize). ^ results ! Item was changed: ----- Method: NewspeakInterpreterSimulator>>primitiveGetAttribute (in category 'other primitives') ----- primitiveGetAttribute "Fetch the system attribute with the given integer ID. The result is a string, which will be empty if the attribute is not defined." | attr s attribute | attr := self stackIntegerValue: 0. self successful ifTrue: [ attribute := Smalltalk getSystemAttribute: attr. attribute ifNil: [ ^self primitiveFail ]. + s := self instantiateClass: (self splObj: ClassByteString) indexableSize: attribute size. - s := self instantiateClass: (self splObj: ClassString) indexableSize: attribute size. 1 to: attribute size do: [ :i | self storeByte: i-1 ofObject: s withValue: (attribute at: i) asciiValue]. self pop: 2. "rcvr, attr" self push: s]. ! Item was changed: ----- Method: NewspeakInterpreterSimulator>>primitiveImageName (in category 'file primitives') ----- primitiveImageName "Note: For now, this only implements getting, not setting, the image file name." | result imageNameSize | self pop: 1. imageNameSize := imageName size. + result := self instantiateClass: (self splObj: ClassByteString) - result := self instantiateClass: (self splObj: ClassString) indexableSize: imageNameSize. 1 to: imageNameSize do: [:i | self storeByte: i-1 ofObject: result withValue: (imageName at: i) asciiValue]. self push: result.! Item was changed: ----- Method: ObjectMemory>>classString (in category 'plugin support') ----- classString + ^self splObj: ClassByteString! - ^self splObj: ClassString! Item was changed: ----- Method: StackInterpreterSimulator>>makeDirEntryName:size:createDate:modDate:isDir:fileSize: (in category 'file primitives') ----- makeDirEntryName: entryName size: entryNameSize createDate: createDate modDate: modifiedDate isDir: dirFlag fileSize: fileSize | modDateOop createDateOop nameString results | <var: 'entryName' type: 'char *'> results := objectMemory instantiateClass: (objectMemory splObj: ClassArray) indexableSize: 5. + nameString := objectMemory instantiateClass: (objectMemory splObj: ClassByteString) indexableSize: entryNameSize. - nameString := objectMemory instantiateClass: (objectMemory splObj: ClassString) indexableSize: entryNameSize. createDateOop := self positive32BitIntegerFor: createDate. modDateOop := self positive32BitIntegerFor: modifiedDate. 1 to: entryNameSize do: [ :i | objectMemory storeByte: i-1 ofObject: nameString withValue: (entryName at: i) asciiValue]. objectMemory storePointerUnchecked: 0 ofObject: results withValue: nameString. objectMemory storePointerUnchecked: 1 ofObject: results withValue: createDateOop. objectMemory storePointerUnchecked: 2 ofObject: results withValue: modDateOop. dirFlag ifTrue: [ objectMemory storePointerUnchecked: 3 ofObject: results withValue: objectMemory trueObject ] ifFalse: [ objectMemory storePointerUnchecked: 3 ofObject: results withValue: objectMemory falseObject ]. objectMemory storePointerUnchecked: 4 ofObject: results withValue: (objectMemory integerObjectOf: fileSize). ^ results! Item was changed: ----- Method: StackInterpreterSimulator>>primitiveGetAttribute (in category 'other primitives') ----- primitiveGetAttribute "Fetch the system attribute with the given integer ID. The result is a string, which will be empty if the attribute is not defined." | attr s attribute | attr := self stackIntegerValue: 0. self successful ifTrue: [ attribute := Smalltalk getSystemAttribute: attr. attribute ifNil: [ ^self primitiveFail ]. + s := objectMemory instantiateClass: (objectMemory splObj: ClassByteString) indexableSize: attribute size. - s := objectMemory instantiateClass: (objectMemory splObj: ClassString) indexableSize: attribute size. 1 to: attribute size do: [ :i | objectMemory storeByte: i-1 ofObject: s withValue: (attribute at: i) asciiValue]. self pop: 2. "rcvr, attr" self push: s]! Item was changed: ----- Method: StackInterpreterSimulator>>primitiveImageName (in category 'file primitives') ----- primitiveImageName "Note: For now, this only implements getting, not setting, the image file name." | result imageNameSize | self pop: 1. imageNameSize := imageName size. + result := objectMemory instantiateClass: (objectMemory splObj: ClassByteString) - result := objectMemory instantiateClass: (objectMemory splObj: ClassString) indexableSize: imageNameSize. 1 to: imageNameSize do: [:i | objectMemory storeByte: i-1 ofObject: result withValue: (imageName at: i) asciiValue]. self push: result.!

1 0

bitShift: and runtime sign discussion
by Nicolas Cellier 03 Jan '13

03 Jan '13

As you may know, the CCodeGenerator is clever enough to #generateBitShift:on:indent: with proper direction << or >> when the shift is literal. When the shift in (expr bitShift: shift) is a variable or another expression, it will produce a runtime test (shift <0) ? expr>>shift : expr <<shift; This is good for an arbitrary shift, but more than often we know the sign and direction of the shift in advance, and this runtime test is void. We must be aware that aggressive inlining will spread these useless code all around. Well, we might ignore impact on performance but we shall better not ignore warnings generated by C compiler (or XCode analyzer) if we want the code to be portable to other compilers (including future versions of gcc). ...and the eventual warnings will be spreaded too Maybe we could arrange for CCodeGenerator to recognize more cases when the shift is unsigned, but 1) the CCodeGenerator is yet unable to infer expression type (except some hack for declared variable) 2) we almost never use unsigned declaration in vm source anyway. In the mean time, I suggest we use << and >> directlty in smalltalk code (slang) when we know the direction in advance. Find a few examples attached Nicolas

3 5

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

02 Jan '13

Revision: 2649 Author: eliot Date: 2013-01-02 12:19:55 -0800 (Wed, 02 Jan 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.244. Restore Cogit wanting COGMTVM to be determined on command line. Probably broke in VMMaker.oscog-eem.218. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-01-02 20:05:38 UTC (rev 2648) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-01-02 20:19:55 UTC (rev 2649) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 from - StackToRegisterMappingCogit VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + StackToRegisterMappingCogit VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -151,7 +151,6 @@ #define CmpCwR 89 #define CmpRdRd 96 #define CmpRR 75 -#define COGMTVM 0 #define CompactClasses 28 #define ConstZero 1 #define ConvertRRd 102 Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-01-02 20:05:38 UTC (rev 2648) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-01-02 20:19:55 UTC (rev 2649) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator * VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 + CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-01-02 20:05:38 UTC (rev 2648) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-01-02 20:19:55 UTC (rev 2649) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jan 2 12:04:45 PST 2013 + Wed Jan 2 12:19:19 PST 2013 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2013-01-02 20:05:38 UTC (rev 2648) +++ branches/Cog/src/vm/cogit.c 2013-01-02 20:19:55 UTC (rev 2649) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 from - StackToRegisterMappingCogit VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + StackToRegisterMappingCogit VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -151,7 +151,6 @@ #define CmpCwR 89 #define CmpRdRd 96 #define CmpRR 75 -#define COGMTVM 0 #define CompactClasses 28 #define ConstZero 1 #define ConvertRRd 102 Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2013-01-02 20:05:38 UTC (rev 2648) +++ branches/Cog/src/vm/cogit.h 2013-01-02 20:19:55 UTC (rev 2649) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2013-01-02 20:05:38 UTC (rev 2648) +++ branches/Cog/src/vm/cogmethod.h 2013-01-02 20:19:55 UTC (rev 2649) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 */ typedef struct {

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2013