Vm-dev December 2011

vm-dev@lists.squeakfoundation.org

23 participants
33 discussions

VM Maker: VMMaker-dtl.261.mcz
by commits＠source.squeak.org 11 Dec '11

11 Dec '11

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.261.mcz ==================== Summary ==================== Name: VMMaker-dtl.261 Author: dtl Time: 11 December 2011, 2:21:48.991 pm UUID: c62d3995-5d8a-4297-b424-704fc8d3b97a Ancestors: VMMaker-dtl.260 VMMaker 4.7.18 Update primitiveSize to support mirror primitives. Add missing InterpreterSimulator>>successful method. Five of six mirror primitive tests pass, but primitivePerformInSuperclass still requires an update (see Mantis 0007429: Add Mirror Primitives to the VM). =============== Diff against VMMaker-dtl.260 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveSize (in category 'indexing primitives') ----- primitiveSize | rcvr sz | rcvr := self stackTop. (self isIntegerObject: rcvr) ifTrue: [^ self primitiveFail]. "Integers are not indexable" (self formatOf: rcvr) < 2 ifTrue: [^ self primitiveFail]. "This is not an indexable object" sz := self stSizeOf: rcvr. self successful ifTrue: + [self pop: argumentCount + 1 thenPush: (self positive32BitIntegerFor: sz)] - [self pop: 1 thenPush: (self positive32BitIntegerFor: sz)] ! Item was added: + ----- Method: InterpreterSimulator>>successful (in category 'primitive support') ----- + successful + "Answer the state of the primitive failure code/success flag. If + primFailCode is non-zero a primitive has failed. If primFailCode + is greater than one then its value indicates the reason for failure." + + ^primFailCode = 0! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.7.18'! - ^'4.7.17'!

1 0

Re: [Pharo-project] GZipWriteStream crashing my VM when serializing ?
by Mariano Martinez Peck 11 Dec '11

11 Dec '11

So...after debugging the VM, it looks it is crashing in DeflatePlugin >> encodeMatch: length distance: dist encodeMatch: length distance: dist "Encode the given match of length length starting at dist bytes ahead" | literal distance | <inline: true> zipLiterals at: zipLiteralCount put: length - DeflateMinMatch. zipDistances at: zipLiteralCount put: dist. literal := (zipMatchLengthCodes at: length - DeflateMinMatch). zipLiteralFreq at: literal put: (zipLiteralFreq at: literal) + 1. dist < 257 ifTrue:[distance := zipDistanceCodes at: dist - 1] ifFalse:[distance := zipDistanceCodes at: 256 + (dist - 1 bitShift: -7)]. zipDistanceFreq at: distance put: (zipDistanceFreq at: distance) + 1. zipLiteralCount := zipLiteralCount + 1. zipMatchCount := zipMatchCount + 1. ^zipLiteralCount = zipLiteralSize "We *must* flush" or:[(zipLiteralCount bitAnd: 16rFFF) = 0 "Only check every N kbytes" and:[self shouldFlush]] When it does: zipDistanceFreq at: distance put: (zipDistanceFreq at: distance) + 1. it gives a EXC_BAD_ACCESS. distance value is 1444965993 The sender is #deflateBlock: lastIndex chainLength: chainLength goodMatch: goodMatch and sender #primitiveDeflateBlock If I do a call printAllStacks(), I get this part: (gdb) call printAllStacks() Process 0x1f70c924 priority 40 0xbff65968 M GZipWriteStream(DeflateStream)>deflateBlock 555574892: a(n) GZipWriteStream 0xbff6598c M GZipWriteStream(DeflateStream)>nextPutAll: 555574892: a(n) GZipWriteStream 0xbff659a8 M GZipWriteStream(DeflateStream)>next:putAll:startingAt: 555574892: a(n) GZipWriteStream 0xbff659cc M FLBufferedWriteStream>flushBuffer 556072120: a(n) FLBufferedWriteStream 0xbff659e4 M FLBufferedWriteStream>nextBytesPutAll: 556072120: a(n) FLBufferedWriteStream 0xbff65a04 M FLBufferedWriteStream>nextStringPut: 556072120: a(n) FLBufferedWriteStream 0xbff65a24 M [] in FLVariablesMapping>serializeMappingOn: 557179132: a(n) FLVariablesMapping 0xbff65a44 M OrderedCollection>do: 557179148: a(n) OrderedCollection 0xbff65a64 M FLVariablesMapping>serializeMappingOn: 557179132: a(n) FLVariablesMapping 0xbff65a80 M FLFixedObjectCluster(FLPointerObjectCluster)>serializeInstancesStepWith: 556081188: a(n) FLFixedObjectCluster 0xbff65a9c M FLSerialization>clusterInstancesStepOf: 556076884: a(n) FLSerialization 0xbff65ab8 M [] in FLSerialization>instancesStep 556076884: a(n) FLSerialization And from the gdb I get: #0 0x000b3721 in deflateBlockchainLengthgoodMatch at ZipPlugin.c:303 #1 0x000b4a62 in primitiveDeflateBlock at ZipPlugin.c:719 #2 0x1f400858 in ?? #3 0x00067820 in threadSchedulingLoop at gcc3x-cointerpmt.c:45853 #4 0x0003d79b in initialEnterSmalltalkExecutive at gcc3x-cointerpmt.c:18372 #5 0x0003e45f in initStackPagesAndInterpret at gcc3x-cointerpmt.c:18839 #6 0x00022ae8 in interpret at gcc3x-cointerpmt.c:2076 #7 0x0006df20 in -[sqSqueakMainApplication runSqueak] at sqSqueakMainApplication.m:174 #8 0x92ee186c in __NSFirePerformWithOrder #9 0x967fadd2 in __CFRunLoopDoObservers #10 0x967b6ced in __CFRunLoopRun #11 0x967b63c4 in CFRunLoopRunSpecific #12 0x967b61f1 in CFRunLoopRunInMode #13 0x98262e04 in RunCurrentEventLoopInMode #14 0x98262af5 in ReceiveNextEventCommon #15 0x98262a3e in BlockUntilNextEventMatchingListInMode #16 0x93159595 in _DPSNextEvent #17 0x93158dd6 in -[NSApplication nextEventMatchingMask:untilDate:inMode:dequeue:] #18 0x9311b1f3 in -[NSApplication run] #19 0x93113289 in NSApplicationMain #20 0x0006bec9 in main at main.m:52 Any pointer is appreaciated. THanks On Fri, Dec 2, 2011 at 11:57 PM, Diogenes Moreira < diogenes.moreira(a)gmail.com> wrote: > en que SO estas corriendo..primitiva ?? > por otro lado que tenes en el PharoDebug.Log > > http://about.me/diogenes.moreira > > > > 2011/12/2 Mariano Martinez Peck <marianopeck(a)gmail.com>: > > Hi guys. We are doing some experiments with Fuel and GZip streams... Now > I > > have a beatiful test like this: > > > > testMethodContextThisContext > > > > | materializedContext context | > > context := thisContext copy. > > materializedContext := self resultOfSerializeAndMaterialize: context. > > > > and it crashes like crazy. From the VM crash stack, I can see: > > > > > > Smalltalk stack dump: > > 0xbff66ba4 M GZipWriteStream(DeflateStream)>deflateBlock 447551436: a(n) > > GZipWriteStream > > 0xbff66bc8 M GZipWriteStream(DeflateStream)>nextPutAll: 447551436: a(n) > > GZipWriteStream > > 0xbff66be4 M GZipWriteStream(DeflateStream)>next:putAll:startingAt: > > 447551436: a(n) GZipWriteStream > > 0xbff66c08 M FLBufferedWriteStream>flushBuffer 448048664: a(n) > > FLBufferedWriteStream > > 0xbff66c20 M FLBufferedWriteStream>nextBytesPutAll: 448048664: a(n) > > FLBufferedWriteStream > > 0xbff66c40 M FLBufferedWriteStream>nextStringPut: 448048664: a(n) > > FLBufferedWriteStream > > 0xbff66c5c M FLByteStringCluster>serialize:on: 448054196: a(n) > > FLByteStringCluster > > 0xbff66c7c M > FLByteStringCluster(FLPrimitiveCluster)>serializeInstance:with: > > 448054196: a(n) FLByteStringCluster > > 0xbff66ca0 M [] in > > FLByteStringCluster(FLIteratingCluster)>serializeInstances: 448054196: > a(n) > > FLByteStringCluster > > 0xbff66cc8 M IdentitySet(Set)>do: 451711680: a(n) IdentitySet > > 0xbff66ce4 M FLByteStringCluster(FLIteratingCluster)>serializeInstances: > > 448054196: a(n) FLByteStringCluster > > 0xbff66d00 M > > FLByteStringCluster(FLIteratingCluster)>serializeInstancesStepWith: > > 448054196: a(n) FLByteStringCluster > > 0xbff66d1c M FLSerialization>clusterInstancesStepOf: 448053428: a(n) > > FLSerialization > > 0xbff66d38 M [] in FLSerialization>instancesStep 448053428: a(n) > > FLSerialization > > 0xbff66d58 M OrderedCollection>do: 449989736: a(n) OrderedCollection > > 0xbff66d74 M FLSerialization>instancesStep 448053428: a(n) > FLSerialization > > 0xbff66d8c M FLSerialization>run 448053428: a(n) FLSerialization > > 0xbff66db0 I [] in FLSerializer>defaultSerialization 447550464: a(n) > > FLSerializer > > 0xbff66dd8 M [] in FLSerializer>serialize:on: 447550464: a(n) > FLSerializer > > 0xbff66df8 M BlockClosure>ensure: 448052884: a(n) BlockClosure > > 0xbff66e18 M FLSerializer>serialize:on: 447550464: a(n) FLSerializer > > 0xbff66e3c M [] in > > FLMethodContextSerializationTest(FLSerializationTest)>serialize: > 447235380: > > a(n) FLMethodContextSerializationTest > > 0xbff66e60 M [] in GZipWriteStream class(PositionableStream class)>on:do: > > 419845144: a(n) GZipWriteStream class > > 0xbff66e80 M BlockClosure>ensure: 448048616: a(n) BlockClosure > > 0xbff66ea0 M GZipWriteStream class(PositionableStream class)>on:do: > > 419845144: a(n) GZipWriteStream class > > 0xbff66ec4 M [] in FLGZipStrategy>writeStreamDo: 447550896: a(n) > > FLGZipStrategy > > 0xbff66ee0 M FLByteArrayStreamStrategy>writeStreamDo: 447550884: a(n) > > FLByteArrayStreamStrategy > > 0xbff66efc M FLGZipStrategy>writeStreamDo: 447550896: a(n) FLGZipStrategy > > 0xbff66f18 M > > FLMethodContextSerializationTest(FLSerializationTest)>serialize: > 447235380: > > a(n) FLMethodContextSerializationTest > > 0xbff66f34 M > > > FLMethodContextSerializationTest(FLSerializationTest)>resultOfSerializeAndMaterialize: > > 447235380: a(n) FLMethodContextSerializationTest > > 0xbff66f58 M > FLMethodContextSerializationTest>testMethodContextThisContext > > 447235380: a(n) FLMethodContextSerializationTest > > > > > > any idea of where I should start to look at? > > > > Thanks > > > > > > -- > > Mariano > > http://marianopeck.wordpress.com > > > -- Mariano http://marianopeck.wordpress.com

2 8

VM Maker: VMMaker.oscog-eem.140.mcz
by commits＠source.squeak.org 10 Dec '11

10 Dec '11

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.140.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.140 Author: eem Time: 9 December 2011, 4:15:07.432 pm UUID: 2487009c-2c13-4609-b89e-77f0e195f433 Ancestors: VMMaker.oscog-eem.139 Stop the backward jump compilation variables being localised to interpret. If this happens the unoptimized debug VM can behave very differently to the optimized VMs. Use definedAsMacro in tryToInlineMethodsIn: instead of accessing properties directly (i.e. as other senders of definedAsMacro). =============== Diff against VMMaker.oscog-eem.139 =============== Item was changed: ----- Method: CoInterpreter>>longUnconditionalJump (in category 'jump bytecodes') ----- longUnconditionalJump | offset switched | offset := (((currentBytecode bitAnd: 7) - 4) * 256) + self fetchByte. localIP := localIP + offset. "backward jump means we're in a loop. - check for possible interrupts. - check for long-running loops and JIT if appropriate." 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 bitShift: BytesPerWord * 8 - 2]]] ifFalse: [lastBackwardJumpMethod := method. backwardJumpCount := minBackwardJumpCountForCompile]]. self fetchNextBytecode! Item was added: + ----- Method: CoInterpreter>>resetBackwardJumpVariables (in category 'jump bytecodes') ----- + resetBackwardJumpVariables + "Reference these variables from outside interpret to avoid them being localised to interpret. + Oh the hacks we commit for Slang..." + <cmacro: '() /* nada */'> + <inline: #false> + lastBackwardJumpMethod := lastBackwardJumpMethod. + backwardJumpCount := backwardJumpCount! Item was changed: ----- Method: TMethod>>tryToInlineMethodsIn: (in category 'inlining') ----- tryToInlineMethodsIn: aCodeGen "Expand any (complete) inline methods called by this method. Set the complete bit when all inlining has been done. Return true if something was inlined." | stmtLists didSomething newStatements sendsToInline | + self definedAsMacro ifTrue: - (properties includesKey: #cmacro:) ifTrue: [complete := true. ^false]. didSomething := false. sendsToInline := Dictionary new: 100. parseTree nodesDo: [ :n | (self inlineableFunctionCall: n in: aCodeGen) ifTrue: [sendsToInline at: n put: (self inlineFunctionCall: n in: aCodeGen)]] unless: "Don't inline the arguments to asserts to keep the asserts readable" [:n| n isSend and: [#(cCode:inSmalltalk: assert:) includes: n selector]]. sendsToInline isEmpty ifFalse: [didSomething := true. parseTree := parseTree replaceNodesIn: sendsToInline]. didSomething ifTrue: [writtenToGlobalVarsCache := nil. ^didSomething]. stmtLists := self statementsListsForInlining. stmtLists do: [ :stmtList | newStatements := OrderedCollection new: 100. stmtList statements do: [ :stmt | (self inlineCodeOrNilForStatement: stmt in: aCodeGen) ifNil: [newStatements addLast: stmt] ifNotNil: [:inlinedStmts| didSomething := true. newStatements addAllLast: inlinedStmts]]. stmtList setStatements: newStatements asArray]. didSomething ifTrue: [writtenToGlobalVarsCache := nil. ^didSomething]. complete ifFalse: [self checkForCompleteness: stmtLists in: aCodeGen. complete ifTrue: [ didSomething := true ]]. "marking a method complete is progress" ^didSomething!

1 0

#cannotInterpet: use last class rather than receiver's class?
by Mariano Martinez Peck 08 Dec '11

08 Dec '11

Hi guys. When the finds a methodDict in nil during the method lookup, it sends #cannotInterpret: to the receiver, but starting the methodLookup in the superclass of the class whose method dict was nil. Example, if I have A subclass from B and B has the method dict in nil, if I sent #foo to an instance of A, it will send #cannotInterpret: to such instance but starting the method lookup (of the #cannotInterpret:) in B (the superclass). Now, when sending #cannotInterpret: aMessage, it sends as parameter an instance of Message. The thing is that in the instVar "lookupClass" it puts the receiver's class. In this example, A. But when you are implementing #cannotInterpret: such info (the lookupClass) is already there, because you DO have the receiver (in self), so you could always do a "self class". In my case, for some proxies I am doing, I would need not the lookupClass, but the class whose methodDict was nil, in this case, B. So, questions: 1) Do I break something if I do this? Am I limiting the solution somehow? it is not always true that I can get the lookupClass while doing "self class" ? is there someone using this hook of #cannotInterpret:? 2) Ok, I know that I should send an instance of Message with something it is not the lookupClass in the instVar 'lookupClass', but it is a lookupClass in some form ;) Thanks in advance, -- Mariano http://marianopeck.wordpress.com

2 3

Won't compile if not run extract-commit-info.sh
by Mariano Martinez Peck 08 Dec '11

08 Dec '11

Hi (Igor?). Nowadays, if you don't execute (by hand) ./codegen-scripts/extract-commit-info.sh then the VM will simply don't compile. So...can we somehow attach this to the makefiles or cmake so that it automatically executes it? Thanks -- Mariano http://marianopeck.wordpress.com

2 5

Building Cog on Mac Lion
by Sean P. DeNigris 06 Dec '11

06 Dec '11

Has anyone successfully done this? I spent several hours tonight and couldn't quite get there... I started with the files and build scripts from jenkins (cog.tar.gz and vmmaker-image.zip) and this is what I found: * Carbon Jit - after manually adjusting some "AGL/gl.h"s to "OpenGl/gl.h"s, and defining "useTempMem (1L << 2)", it stopped at 53% (see [1] below) * Cocoa Jit - with FT2Plugin via make, stopped at 99% while building free type library (see [2] below) * Without FT2 via make, builds, but immediately fails when an image is opened, no dump * cmake -G Xcode with FT2 same as above [1] > /Developer/cog_xcode/platforms/Mac OS/vm/sqMacNSPluginUILogic2.h:18: > error: expected ‘)’ before ‘*’ token > /Developer/cog_xcode/platforms/Mac OS/vm/NSCursorWrappers.m:52: error: > expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘macCursor’ > /Developer/cog_xcode/platforms/Mac OS/vm/NSCursorWrappers.m: In function > ‘SetCursorBackToSomething’: > /Developer/cog_xcode/platforms/Mac OS/vm/NSCursorWrappers.m:59: warning: > implicit declaration of function ‘SetCursor’ > /Developer/cog_xcode/platforms/Mac OS/vm/NSCursorWrappers.m:59: error: > ‘macCursor’ undeclared (first use in this function) > /Developer/cog_xcode/platforms/Mac OS/vm/NSCursorWrappers.m:59: error: > (Each undeclared identifier is reported only once > /Developer/cog_xcode/platforms/Mac OS/vm/NSCursorWrappers.m:59: error: for > each function it appears in.) > [2] > [ 99%] Building freetype library > Cloning into freetype2... > remote: Counting objects: 42449, done. > remote: Compressing objects: 100% (7719/7719), done. > remote: Total 42449 (delta 34919), reused 41796 (delta 34438) > Receiving objects: 100% (42449/42449), 11.63 MiB | 1.31 MiB/s, done. > Resolving deltas: 100% (34919/34919), done. > Note: checking out 'VER-2-4-4'. > > You are in 'detached HEAD' state. You can look around, make experimental > changes and commit them, and you can discard any commits you make in this > state without impacting any branches by performing another checkout. > > If you want to create a new branch to retain commits you create, you may > do so (now or later) by using -b with the checkout command again. Example: > > git checkout -b new_branch_name > > HEAD is now at 9ec31ce... * Version 2.4.4 released. > ========================= > ERROR: Your version of the `aclocal' tool is too old. > Minimum version 1.10.1 is required (yours is version 1.10). > Please upgrade or use the ACLOCAL variable to point to a more > recent one. > > > FreeType build system -- automatic system detection > > The following settings are used: > > platform unix > compiler cc > configuration directory ./builds/unix > configuration rules ./builds/unix/unix.mk > > If this does not correspond to your system or settings please remove the > file > `config.mk' from this directory then read the INSTALL file for help. > > Otherwise, simply type `make' again to build the library, > or `make refdoc' to build the API reference (the latter needs python). > > Generating modules list in ./objs/ftmodule.h... > * module: truetype (Windows/Mac font files with extension *.ttf or *.ttc) > * module: type1 (Postscript font files with extension *.pfa or *.pfb) > * module: cff (OpenType fonts with extension *.otf) > * module: cid (Postscript CID-keyed fonts, no known extension) > * module: pfr (PFR/TrueDoc font files with extension *.pfr) > * module: type42 (Type 42 font files with no known extension) > * module: winfnt (Windows bitmap fonts with extension *.fnt or *.fon) > * module: pcf (pcf bitmap fonts) > * module: bdf (bdf bitmap fonts) > * module: sfnt (helper module for TrueType & OpenType formats) > * module: autofit (automatic hinting module) > * module: pshinter (Postscript hinter module) > * module: raster (monochrome bitmap renderer) > * module: smooth (anti-aliased bitmap renderer) > * module: smooth (anti-aliased bitmap renderer for LCDs) > * module: smooth (anti-aliased bitmap renderer for vertical LCDs) > * module: psaux (Postscript Type 1 & Type 2 helper module) > * module: psnames (Postscript & Unicode Glyph name handling) > done. > /bin/sh: ./configure: No such file or directory > make[3]: *** [setup] Error 127 > config.mk:25: builds/unix/unix-def.mk: No such file or directory > config.mk:26: builds/unix/unix-cc.mk: No such file or directory > make[3]: *** No rule to make target `builds/unix/unix-cc.mk'. Stop. > config.mk:25: builds/unix/unix-def.mk: No such file or directory > config.mk:26: builds/unix/unix-cc.mk: No such file or directory > make[3]: *** No rule to make target `builds/unix/unix-cc.mk'. Stop. > cp: ./freetype2/objs/.libs/libfreetype.a: No such file or directory > make[2]: *** [FT2Plugin/libfreetype.a] Error 1 > make[1]: *** [FT2Plugin/CMakeFiles/FT2Plugin.dir/all] Error 2 > make: *** [all] Error 2 > -- View this message in context: http://forum.world.st/Building-Cog-on-Mac-Lion-tp4159537p4159537.html Sent from the Squeak VM mailing list archive at Nabble.com.

3 7

CMake Mac Configs Are Inconsistent
by Sean P. DeNigris 06 Dec '11

06 Dec '11

Debug/Release: ========== CocoaIOSConfig (Cocoa) uses #generateForDebug and #generateForRelease to mark an instance as debug/release, but CogMacOSConfig (Carbon) subclasses redefine #compilerFlags to return either #compilerFlagsRelease or #compilerFlagsDebug. I was going to make them consistent, but which one is better? It seemed like the first one was a little easier to use from a workspace. Naming: ====== Really confusing e.g. CocoaIOS means Cocoa (but where does the IOS part come in?) and CogMacOS means Carbon; notice one has Cog prefix, the other not Sean -- View this message in context: http://forum.world.st/CMake-Mac-Configs-Are-Inconsistent-tp4161337p4161337.… Sent from the Squeak VM mailing list archive at Nabble.com.

2 2

Available debug vms for users?
by Mariano Martinez Peck 05 Dec '11

05 Dec '11

Hi guys. Building the VM could take time, mostly for new people. Lots of time people report a crash and some answers are "can you run it with gdb and tell me what is ...". So, what about providing a debug vm as well as the "production" one? I know it requires some time to do it, but I think it can be worth it. Eliot, when you release a new VM, I don't imagine you do all by hand, you must have a script somewhere. Maybe just adding a couple of lines to also provide debug vms would be very very cool. Igor/Esteban: you can also do that very easily in jenkins since you already have configurations for debug. Cheers -- Mariano <http://marianopeck.wordpress.com>, trying to build again the VM in debug mode to trace a crash...

3 3

VM Maker: CMakeVMMaker-EstebanLorenzano.142.mcz
by commits＠source.squeak.org 03 Dec '11

03 Dec '11

Esteban Lorenzano uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-EstebanLorenzano.142.mcz ==================== Summary ==================== Name: CMakeVMMaker-EstebanLorenzano.142 Author: EstebanLorenzano Time: 3 December 2011, 6:14:27 pm UUID: b72f285e-497c-4038-8d47-1565d66627e7 Ancestors: CMakeVMMaker-EstebanLorenzano.141 -some refactors to avoid duplicated code -added #generateForRelease (default) and #generateForDebug protocols -removed CogCocoaIOSConfigDebug (not needed anymore) -StackCocoaIOSARMConfig to build iStackVM, but still not working =============== Diff against CMakeVMMaker-EstebanLorenzano.141 =============== Item was changed: MacOSConfig subclass: #CocoaIOSConfig + instanceVariableNames: 'generateForRelease' - instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMaker-IOS'! !CocoaIOSConfig commentStamp: 'MarianoMartinezPeck 4/24/2011 15:34' prior: 0! This is an abstract class for all Mac Cocoa configurations. It is intended to share code between different concrete implementations. Fore more information, check the class comments of all the superclasses. ! Item was changed: ----- Method: CocoaIOSConfig>>SqueakDebug (in category 'bundle strings') ----- SqueakDebug + ^self isGenerateForRelease + ifTrue: [ 0 ] + ifFalse: [ 1 ]! - ^0! Item was added: + ----- Method: CocoaIOSConfig>>architecture (in category 'settings') ----- + architecture + ^'i386'! Item was changed: ----- Method: CocoaIOSConfig>>compilerFlags (in category 'accessing') ----- compilerFlags | releaseFlags | + releaseFlags := self isGenerateForRelease - releaseFlags := self isRelease ifTrue: [ self compilerFlagsRelease ] ifFalse: [ self compilerFlagsDebug ]. ^String streamContents: [ :stream | (self commonCompilerFlags, releaseFlags) do: [ :each | stream nextPutAll: each ] separatedBy: [ stream space ] ]! Item was changed: ----- Method: CocoaIOSConfig>>extraPluginSettings: (in category 'plugin extra rules') ----- extraPluginSettings: maker maker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'. maker setTargetProperty: 'COMPILE_FLAGS' to: '"-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. maker isExternal ifTrue: [ "copy result to results dir " maker set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir. maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir. maker puts: 'list(APPEND linkFlags "-undefined dynamic_lookup")' ]. + "maker addXCodeProperty: 'GCC_VERSION' value: '4.3'." - maker addXCodeProperty: 'GCC_VERSION' value: '4.2'. maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/' , self executableName , '_Prefix.pch'. ! Item was changed: ----- Method: CocoaIOSConfig>>extraVMSettings: (in category 'settings') ----- extraVMSettings: maker + maker set: 'CMAKE_OSX_ARCHITECTURES' to: self architecture. - maker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'. maker set: 'resourceDir' toString: self resourcesDir, '/ProjectBuilder'. + maker + set: 'resources' + to: (String streamContents: [ :stream | + self resources + do: [ :each | + stream + nextPut: $"; + nextPutAll: '${resourceDir}/'; + nextPutAll: each; + nextPut: $"] + separatedBy: [ stream space ] ]). - maker set: 'resources' to: - '"${resourceDir}/Squeak VM.r" - "${resourceDir}/Squeak.icns" - "${resourceDir}/Cog.icns" - "${resourceDir}/SqueakChanges.icns" - "${resourceDir}/SqueakImage.icns" - "${resourceDir}/SqueakPlugin.icns" - "${resourceDir}/SqueakScript.icns" - "${resourceDir}/SqueakGeneric.icns" - "${resourceDir}/SqueakProject.icns" - "${resourceDir}/SqueakSources.icns"'. maker set: 'resourcesLocaleEnglish' to: '"${resourceDir}/English.lproj/InfoPlist.strings" "${resourceDir}/English.lproj/MainMenu.nib"' ! Item was added: + ----- Method: CocoaIOSConfig>>generateForDebug (in category 'accessing') ----- + generateForDebug + generateForRelease := false! Item was added: + ----- Method: CocoaIOSConfig>>generateForRelease (in category 'accessing') ----- + generateForRelease + generateForRelease := true! Item was added: + ----- Method: CocoaIOSConfig>>initialize (in category 'initialization') ----- + initialize + super initialize. + self generateForRelease! Item was added: + ----- Method: CocoaIOSConfig>>isGenerateForRelease (in category 'testing') ----- + isGenerateForRelease + ^generateForRelease! Item was removed: - ----- Method: CocoaIOSConfig>>isRelease (in category 'testing') ----- - isRelease - ^true! Item was changed: ----- Method: CocoaIOSConfig>>precompiledHeaders (in category 'settings') ----- precompiledHeaders ^ '// // Prefix header for all source files of the ''', self executableName, ''' target in the ''', self executableName, ''' project // #ifdef __OBJC__ + ', + (String streamContents: [ :stream | + self precompiledImports + do: [ :each | + stream + nextPutAll: '#import '; + nextPut: $<; + nextPutAll: each; + nextPut: $> ] + separatedBy: [ + stream cr ] ]), ' - #import <Cocoa/Cocoa.h> #endif '! Item was added: + ----- Method: CocoaIOSConfig>>precompiledImports (in category 'settings') ----- + precompiledImports + ^#('Cocoa/Cocoa.h')! Item was added: + ----- Method: CocoaIOSConfig>>resources (in category 'settings') ----- + resources + ^#('Squeak VM.r' + 'Cog.icns' + 'Squeak.icns' + 'SqueakChanges.icns' + 'SqueakPlugin.icns' + 'SqueakScript.icns' + 'SqueakGeneric.icns' + 'SqueakProject.icns' + 'SqueakSources.icns') + + ! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>compilerFlagsRelease (in category 'settings') ----- compilerFlagsRelease ^#('-g0' '-Os' '-fvisibility=hidden' '-funroll-loops' '-fasm-blocks' '-finline-functions' '-mfpmath=sse' '-fomit-frame-pointer' '-march=pentium-m' '-mtune=prescott' '-falign-functions=16' '-fno-gcse' '-fno-cse-follow-jumps' '-std=gnu99' '-DBUILD_FOR_OSX' '-DUSE_INLINE_MEMORY_ACCESSORS' '-DLSB_FIRST' '-DUSE_INLINE_MEMORY_ACCESSORS' '-DHAVE_SYS_TIME_H' '-DHAVE_NANOSLEEP' '-DNDEBUG' '-DDEBUGVM=0' '-DCOGMTVM=0' '-DUSE_GLOBAL_STRUCT=0' '-DBASE_HEADER_SIZE=4')! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>setExtraTargetProperties: (in category 'settings') ----- setExtraTargetProperties: maker | plist | maker addFrameworks: self frameworks. " generated and add Info.plist file " plist := self plistFile. (maker buildDir forceNewFileNamed: 'Info.plist') nextPutAll: plist; close. maker addProperty: 'MACOSX_BUNDLE_INFO_PLIST' value: '${buildDir}/Info.plist'. maker cmd: 'set_source_files_properties' params: '${resources} PROPERTIES MACOSX_PACKAGE_LOCATION Resources'. maker cmd: 'set_source_files_properties' params: '${resourcesLocaleEnglish} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/English.lproj'. maker cmd: 'set_source_files_properties' params: '${ENGLISH_RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/English.lproj'. (maker buildDir forceNewFileNamed: self prefixHeaderFileName) nextPutAll: self precompiledHeaders; close. maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', self prefixHeaderFileName. maker addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-DLSB_FIRST -mfpmath=sse -finline-functions -fno-cse-follow-jumps -fno-gcse -mtune=prescott -march=pentium-m -falign-functions=16'. + "maker + addXCodeProperty: 'GCC_VERSION' value: '4.3'." - maker - addXCodeProperty: 'GCC_VERSION' value: '4.2'. maker cmd: 'set_target_properties' params: self executableName, ' PROPERTIES COMPILE_FLAGS "-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir. maker set: 'RUNTIME_OUTPUT_DIRECTORY' toString: self outputDir.! Item was removed: - CogMTCocoaIOSConfig subclass: #CogMTCocoaIOSDebugConfig - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMaker-IOS'! - - !CogMTCocoaIOSDebugConfig commentStamp: 'MarianoMartinezPeck 4/24/2011 15:35' prior: 0! - This is a concrete class which generates a DEBUG thread-aware VM and threaded FFI CogVM for Mac using the Cocoa library. This VM is normally known as a debug CogMTVM. The debug means that it is compiled with all the necessary symbolic symbols for debugging and can be debugged, for example, with GDB. - - Fore more information, check the class comments of all the superclasses. - ! Item was removed: - ----- Method: CogMTCocoaIOSDebugConfig>>SqueakDebug (in category 'bundle strings') ----- - SqueakDebug - ^1! Item was removed: - ----- Method: CogMTCocoaIOSDebugConfig>>isRelease (in category 'testing') ----- - isRelease - "I'm a debug" - ^false! Item was added: + StackCocoaIOSCLANGConfig subclass: #StackCocoaIOSARMConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-IOS'! Item was added: + ----- Method: StackCocoaIOSARMConfig>>architecture (in category 'settings') ----- + architecture + ^'"armv6" "armv7"'! Item was added: + ----- Method: StackCocoaIOSARMConfig>>commonCompilerFlags (in category 'accessing') ----- + commonCompilerFlags + "Common compiler flags" + ^#('-arch armv6' + '-arch armv7' + '-miphoneos-version-min=4.3' + '-isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk' + '-x objective-c' + '-DTARGET_OS_IS_IPHONE' + '-DHAVE_UUID_GENERATE')! Item was added: + ----- Method: StackCocoaIOSARMConfig>>compilerFlagsDebug (in category 'settings') ----- + compilerFlagsDebug + ^#('-g3' '-O0' '-fvisibility=hidden' '-funroll-loops' '-fasm-blocks' '-finline-functions' '-mfpmath=sse' '-march=pentium-m' '-mtune=prescott' '-falign-functions=16' '-fno-gcse' '-fno-cse-follow-jumps' '-std=gnu99' '-DUSE_INLINE_MEMORY_ACCESSORS' '-DLSB_FIRST' '-DUSE_INLINE_MEMORY_ACCESSORS' '-DHAVE_SYS_TIME_H' '-DHAVE_NANOSLEEP' '-DDEBUGVM=1' '-DCOGMTVM=0' '-DUSE_GLOBAL_STRUCT=0' '-DBASE_HEADER_SIZE=4')! Item was added: + ----- Method: StackCocoaIOSARMConfig>>compilerFlagsRelease (in category 'settings') ----- + compilerFlagsRelease + ^#('-g0' '-Os' '-fvisibility=hidden' '-funroll-loops' '-fasm-blocks' '-finline-functions' '-mfpmath=sse' '-fomit-frame-pointer' '-march=pentium-m' '-mtune=prescott' '-falign-functions=16' '-fno-gcse' '-fno-cse-follow-jumps' '-std=gnu99' '-DUSE_INLINE_MEMORY_ACCESSORS' '-DLSB_FIRST' '-DUSE_INLINE_MEMORY_ACCESSORS' '-DHAVE_SYS_TIME_H' '-DHAVE_NANOSLEEP' '-DNDEBUG' '-DDEBUGVM=0' '-DCOGMTVM=0' '-DUSE_GLOBAL_STRUCT=0' '-DBASE_HEADER_SIZE=4')! Item was added: + ----- Method: StackCocoaIOSARMConfig>>defaultExternalPlugins (in category 'settings') ----- + defaultExternalPlugins + ^#()! Item was added: + ----- Method: StackCocoaIOSARMConfig>>defaultInternalPlugins (in category 'settings') ----- + defaultInternalPlugins + ^#() + "^ #( + ADPCMCodecPlugin + BMPReadWriterPlugin + BalloonEnginePlugin + BitBltSimulation + ClipboardExtendedPlugin + DSAPlugin + DeflatePlugin + DropPlugin + FFTPlugin + FilePlugin + FloatArrayPlugin + GeniePlugin + HostWindowPlugin + JPEGReadWriter2Plugin + JPEGReaderPlugin + LargeIntegersPlugin + Matrix2x3Plugin + MiscPrimitivePlugin + RePlugin + SecurityPlugin + SocketPlugin + SoundCodecPlugin + SoundGenerationPlugin + SoundPlugin + SurfacePlugin + UUIDPlugin + IOSPlugin + )"! Item was added: + ----- Method: StackCocoaIOSARMConfig>>executableName (in category 'accessing') ----- + executableName + ^ 'iStackVM'! Item was added: + ----- Method: StackCocoaIOSARMConfig>>frameworks (in category 'accessing') ----- + frameworks + ^ #( + "AppKit" + "Cocoa" + AudioToolbox + CoreAudio + CoreGraphics + CoreLocation + UIKit + Foundation + SystemConfiguration + "ApplicationServices" + QuartzCore + OpenGLES)! Item was added: + ----- Method: StackCocoaIOSARMConfig>>platformSources (in category 'source files') ----- + platformSources + "files added from platform/iOS/vm dir " + ^ #( + 'Common/main.m' + 'Common/Classes/Queue.m' + 'Common/Classes/sqMacV2Time.c' + 'Common/Classes/sqSqueakAppDelegate.m' + 'Common/Classes/sqSqueakFileDirectoryAPI.m' + 'Common/Classes/sqSqueakFileDirectoryInterface.m' + 'Common/Classes/sqSqueakInfoPlistInterface.m' + 'Common/Classes/sqSqueakMainApp.m' + 'Common/Classes/sqSqueakMainApplication.m' + 'Common/Classes/sqSqueakMainApplication+attributes.m' + 'Common/Classes/sqSqueakAttributesAPI.m' + 'Common/Classes/sqSqueakMainApplication+events.m' + 'Common/Classes/sqSqueakEventsAPI.m' + 'Common/Classes/sqSqueakMainApplication+imageReadWrite.m' + 'Common/Classes/sqSqueakMainApplication+sound.m' + 'Common/Classes/sqSqueakSoundAPI.m' + 'Common/Classes/sqSqueakMainApplication+vmAndImagePath.m' + 'Common/Classes/sqSqueakVmAndImagePathAPI.m' + 'Common/Classes/sqSqueakMainApplication+screen.m' + 'Common/Classes/sqSqueakScreenAPI.m' + 'Common/Classes/sqSqueakScreenAndWindow.m' + 'Common/Classes/sqSqueakCursorAPI.m' + 'Common/Classes/sqSqueakMainApplication+cursor.m' + 'iPhone/Classes/SqueakNoOGLIPhoneAppDelegate.m' + 'iPhone/Classes/sqSqueakIPhoneApplication.m' + 'iPhone/Classes/sqSqueakIPhoneApplication+attributes.m' + 'iPhone/Classes/sqSqueakIPhoneApplication+clipboard.m' + 'iPhone/Classes/sqSqueakIPhoneApplication+imageReadWrite.m' + 'iPhone/Classes/sqSqueakIPhoneApplication+events.m' + 'iPhone/Classes/sqSqueakIPhoneApplication+Network.m' + 'iPhone/Classes/sqSqueakiPhoneApplication+sound.m' + 'iPhone/Classes/sqSqueakIPhoneFileDirectoryInterface.m' + 'iPhone/Classes/sqSqueakIPhoneInfoPlistInterface.m' + 'iPhone/Classes/sqiPhoneScreenAndWindow.m' + 'iPhone/Classes/SqueakUIView.m' + 'iPhone/Classes/SqueakUIViewCALayer.m' + 'iPhone/Classes/SqueakUIViewOpenGL.m' + 'iPhone/Classes/SqueakUIController.m' + 'iPhone/Classes/sqSqueakIPhoneClipboardAPI.m' + 'iPhone/macintoshextra.c' + 'iPhone/osExports.c' + 'iPhone/sqDummyaio.c' + 'iPhone/sqMacV2Memory.c' + )! Item was added: + ----- Method: StackCocoaIOSARMConfig>>precompiledImports (in category 'settings') ----- + precompiledImports + ^#( + 'Foundation/Foundation.h' + 'UIKit/UIKit.h')! Item was added: + ----- Method: StackCocoaIOSARMConfig>>setExtraTargetProperties: (in category 'settings') ----- + setExtraTargetProperties: maker + "super setExtraTargetProperties: maker." + + | precompiledHeaders plist | + + precompiledHeaders := (self executableName, '_Prefix.pch'). + (maker buildDir forceNewFileNamed: precompiledHeaders) + nextPutAll: self precompiledHeaders; + close. + maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', precompiledHeaders. + + maker set: 'CMAKE_CROSSCOMPILING' to: 'TRUE'. + maker set: 'CMAKE_SYSTEM_NAMEG' toString: 'Darwin'. + maker set: 'CMAKE_SYSTEM_PROCESSOR' toString: 'arm'. + + maker set: 'SDKVER' toString: '5.0'. + maker set: 'DEVROOT' toString: '/Developer/Platforms/iPhoneOS.platform/Developer'. + maker set: 'SDKROOT' toString: '${DEVROOT}/SDKs/iPhoneOS${SDKVER}.sdk'. + + maker include: 'CMakeForceCompiler'. + maker cmd: 'CMAKE_FORCE_C_COMPILER' params: '${DEVROOT}/usr/bin/clang CLang'. + maker cmd: 'CMAKE_FORCE_CXX_COMPILER' params: '${DEVROOT}/usr/bin/clang++ CLang'. + + maker set: 'CMAKE_FIND_ROOT_PATH' to: '"${SDKROOT}" "${DEVROOT}"'. + maker set: 'CMAKE_FIND_ROOT_PATH_MODE_PROGRAM' to: 'NEVER'. + maker set: 'CMAKE_FIND_ROOT_PATH_MODE_LIBRARY' to: 'ONLY'. + maker set: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE' to: 'ONLY'. + + maker addFrameworks: self frameworks. + + " generated and add Info.plist file " + plist := self plistFile. + + (maker buildDir forceNewFileNamed: 'Info.plist') + nextPutAll: plist; + close. + + maker + addProperty: 'MACOSX_BUNDLE_INFO_PLIST' + value: '${buildDir}/Info.plist'. + + maker + cmd: 'set_source_files_properties' + params: '${resources} PROPERTIES MACOSX_PACKAGE_LOCATION Resources'. + + maker + cmd: 'set_source_files_properties' + params: '${resourcesLocaleEnglish} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/English.lproj'. + + maker + cmd: 'set_source_files_properties' + params: '${ENGLISH_RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/English.lproj'. + + maker + cmd: 'set_target_properties' + params: self executableName, ' PROPERTIES COMPILE_FLAGS "-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. + + maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir. + maker set: 'RUNTIME_OUTPUT_DIRECTORY' toString: self outputDir. + !

1 0

[commit] r2521 - Add Bochs plugin makefiles for win32.
by commits＠squeakvm.org 01 Dec '11

01 Dec '11

Author: eliot Date: 2011-12-01 14:12:32 -0800 (Thu, 01 Dec 2011) New Revision: 2521 Added: trunk/platforms/win32/plugins/BochsIA32Plugin/ trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile Modified: trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c Log: Add Bochs plugin makefiles for win32. Add console stdio support for win32. Added: trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile =================================================================== --- trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile (rev 0) +++ trunk/platforms/win32/plugins/BochsIA32Plugin/Makefile 2011-12-01 22:12:32 UTC (rev 2521) @@ -0,0 +1,24 @@ +DLLTOOLEXTRA := $(PLATDIR)/../processors/IA32/winbochs/cpu/libcpu.a \ + $(PLATDIR)/../processors/IA32/winbochs/fpu/libfpu.a \ + $(PLATDIR)/../processors/IA32/winbochs/disasm/libdisasm.a +DLLWRAPEXTRA := $(DLLTOOLEXTRA) + +LINK_WITH_GPP := yes +EXTRALIBS:= -L../../../processors/IA32/winbochs/cpu \ + -L../../../processors/IA32/winbochs/fpu \ + -L../../../processors/IA32/winbochs/disasm \ + -lcpu -lfpu -ldisasm + +include ../../Makefile.plugin + +CXXINCLUDES:= -I$(PLATDIR)/../processors/IA32/winbochs \ + -I$(PLATDIR)/../processors/IA32/bochs \ + -I$(PLATDIR)/../processors/IA32/bochs/instrument/stubs + +CXXFLAGS:= -m32 -mno-cygwin -DWIN32 -msse2 -ggdb2 -mwindows -mthreads -mwin32 \ + -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(CXXINCLUDES) $< + +CXX:=g++ Modified: trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c =================================================================== --- trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c 2011-12-01 22:10:33 UTC (rev 2520) +++ trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c 2011-12-01 22:12:32 UTC (rev 2521) @@ -80,7 +80,11 @@ sqInt sqFileAtEnd(SQFile *f) { win32FileOffset ofs; /* Return true if the file's read/write head is at the end of the file. */ - if (!sqFileValid(f)) FAIL(); + if (!sqFileValid(f)) + FAIL(); + /* If a stdio handle then assume not at end. */ + if (f->isStdioStream) + return 0; ofs.offset = 0; ofs.dwLow = SetFilePointer(FILE_HANDLE(f), 0, &ofs.dwHigh, FILE_CURRENT); return ofs.offset >= sqFileSize(f); @@ -89,8 +93,10 @@ sqInt sqFileClose(SQFile *f) { /* Close the given file. */ - if (!sqFileValid(f)) FAIL(); - if(!CloseHandle(FILE_HANDLE(f))) FAIL(); + if (!sqFileValid(f)) + FAIL(); + if(!CloseHandle(FILE_HANDLE(f))) + FAIL(); RemoveHandleFromTable(win32Files, FILE_HANDLE(f)); f->file = NULL; f->sessionID = 0; @@ -103,18 +109,22 @@ int sz; /* convert the file name into a null-terminated C string */ sz = MultiByteToWideChar(CP_UTF8, 0, fileNameIndex, fileNameSize, NULL, 0); - if(sz > MAX_PATH) FAIL(); + if(sz > MAX_PATH) + FAIL(); MultiByteToWideChar(CP_UTF8, 0, fileNameIndex, fileNameSize, win32Path, sz); win32Path[sz] = 0; - if(hasCaseSensitiveDuplicate(win32Path)) FAIL(); - if(!DeleteFileW(win32Path)) FAIL(); + if(hasCaseSensitiveDuplicate(win32Path)) + FAIL(); + if(!DeleteFileW(win32Path)) + FAIL(); return 1; } squeakFileOffsetType sqFileGetPosition(SQFile *f) { win32FileOffset ofs; /* Return the current position of the file's read/write head. */ - if (!sqFileValid(f)) FAIL(); + if (!sqFileValid(f)) + FAIL(); ofs.offset = 0; ofs.dwLow = SetFilePointer(FILE_HANDLE(f), 0, &ofs.dwHigh, FILE_CURRENT); return ofs.offset; @@ -152,7 +162,8 @@ /* convert the file name into a null-terminated C string */ sz = MultiByteToWideChar(CP_UTF8, 0, fileNameIndex, fileNameSize, NULL, 0); - if(sz > MAX_PATH) FAIL(); + if(sz > MAX_PATH) + FAIL(); MultiByteToWideChar(CP_UTF8, 0, fileNameIndex, fileNameSize, win32Path, sz); win32Path[sz] = 0; @@ -192,12 +203,14 @@ sqInt sqFileStdioHandlesInto(SQFile files[3]) { + DWORD mode; + files[0].sessionID = thisSession; files[0].file = GetStdHandle(STD_INPUT_HANDLE); files[0].fileSize = 0; files[0].writable = false; files[0].lastOp = 0; /* unused on win32 */ - files[0].isStdioStream = 1; + files[0].isStdioStream = GetConsoleMode(files[0].file, &mode) != 0; AddHandleToTable(win32Files, files[0].file); files[1].sessionID = thisSession; @@ -205,7 +218,7 @@ files[1].fileSize = 0; files[1].writable = true; files[1].lastOp = 0; /* unused on win32 */ - files[1].isStdioStream = 1; + files[1].isStdioStream = GetConsoleMode(files[1].file, &mode) != 0; AddHandleToTable(win32Files, files[1].file); files[2].sessionID = thisSession; @@ -213,7 +226,7 @@ files[2].fileSize = 0; files[2].writable = true; files[2].lastOp = 0; /* unused on win32 */ - files[2].isStdioStream = 1; + files[2].isStdioStream = GetConsoleMode(files[2].file, &mode) != 0; AddHandleToTable(win32Files, files[2].file); return 7; @@ -228,8 +241,14 @@ */ DWORD dwReallyRead; - if (!sqFileValid(f)) FAIL(); - ReadFile(FILE_HANDLE(f), (LPVOID) (byteArrayIndex+startIndex), count, &dwReallyRead, NULL); + if (!sqFileValid(f)) + FAIL(); + if (f->isStdioStream) + ReadConsole(FILE_HANDLE(f), (LPVOID) (byteArrayIndex+startIndex), count, + &dwReallyRead, NULL); + else + ReadFile(FILE_HANDLE(f), (LPVOID) (byteArrayIndex+startIndex), count, + &dwReallyRead, NULL); return (int)dwReallyRead; } @@ -241,18 +260,22 @@ /* convert the file name into a null-terminated C string */ sz = MultiByteToWideChar(CP_UTF8, 0, oldNameIndex, oldNameSize, NULL,0); - if(sz > MAX_PATH) FAIL(); + if(sz > MAX_PATH) + FAIL(); MultiByteToWideChar(CP_UTF8, 0, oldNameIndex, oldNameSize, oldPath, sz); oldPath[sz] = 0; /* convert the file name into a null-terminated C string */ sz = MultiByteToWideChar(CP_UTF8, 0, newNameIndex, newNameSize, NULL,0); - if(sz > MAX_PATH) FAIL(); + if(sz > MAX_PATH) + FAIL(); MultiByteToWideChar(CP_UTF8, 0, newNameIndex, newNameSize, newPath, sz); newPath[sz] = 0; - if(hasCaseSensitiveDuplicate(oldPath)) FAIL(); - if(!MoveFileW(oldPath, newPath)) FAIL(); + if(hasCaseSensitiveDuplicate(oldPath)) + FAIL(); + if(!MoveFileW(oldPath, newPath)) + FAIL(); return 1; } @@ -261,7 +284,8 @@ win32FileOffset ofs; ofs.offset = position; /* Set the file's read/write head to the given position. */ - if (!sqFileValid(f)) FAIL(); + if (!sqFileValid(f)) + FAIL(); SetFilePointer(FILE_HANDLE(f), ofs.dwLow, &ofs.dwHigh, FILE_BEGIN); return 1; } @@ -269,14 +293,16 @@ squeakFileOffsetType sqFileSize(SQFile *f) { /* Return the length of the given file. */ win32FileOffset ofs; - if (!sqFileValid(f)) FAIL(); + if (!sqFileValid(f)) + FAIL(); ofs.offset = 0; ofs.dwLow = GetFileSize(FILE_HANDLE(f), &ofs.dwHigh); return ofs.offset; } sqInt sqFileFlush(SQFile *f) { - if (!sqFileValid(f)) FAIL(); + if (!sqFileValid(f)) + FAIL(); /* note: ignores the return value in case of read-only access */ FlushFileBuffers(FILE_HANDLE(f)); return 1; @@ -285,7 +311,8 @@ sqInt sqFileTruncate(SQFile *f, squeakFileOffsetType offset) { win32FileOffset ofs; ofs.offset = offset; - if (!sqFileValid(f)) FAIL(); + if (!sqFileValid(f)) + FAIL(); SetFilePointer(FILE_HANDLE(f), ofs.dwLow, &ofs.dwHigh, FILE_BEGIN); if(!SetEndOfFile(FILE_HANDLE(f))) return 0; return 1; @@ -308,11 +335,16 @@ */ DWORD dwReallyWritten; win32FileOffset ofs; - if (!(sqFileValid(f) && f->writable)) FAIL(); + if (!(sqFileValid(f) && f->writable)) + FAIL(); - WriteFile(FILE_HANDLE(f), (LPVOID) (byteArrayIndex + startIndex), count, &dwReallyWritten, NULL); + if (f->isStdioStream) + WriteConsole(FILE_HANDLE(f), (LPVOID) (byteArrayIndex + startIndex), count, &dwReallyWritten, NULL); + else + WriteFile(FILE_HANDLE(f), (LPVOID) (byteArrayIndex + startIndex), count, &dwReallyWritten, NULL); - if ((int)dwReallyWritten != count) FAIL(); + if ((int)dwReallyWritten != count) + FAIL(); return (int) dwReallyWritten; } @@ -342,7 +374,8 @@ } /* convert the file name into a null-terminated C string */ sz = MultiByteToWideChar(CP_UTF8, 0, fileName, -1, NULL,0); - if(sz > MAX_PATH) FAIL(); + if(sz > MAX_PATH) + FAIL(); MultiByteToWideChar(CP_UTF8, 0, fileName, -1, win32Path, sz); win32Path[sz] = 0;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2011