Vm-dev January 2014

vm-dev@lists.squeakfoundation.org

28 participants
97 discussions

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

13 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.583.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.583 Author: eem Time: 13 January 2014, 12:05:56.387 pm UUID: 0be513d3-c984-427f-a0e2-78bea8c85a26 Ancestors: VMMaker.oscog-dtl.582 Allocate more newSpace for the SpurBootstrap launchSaved shortcut so the interpreter reserve bytes are accomodated. Fix superclass of VMSqueakV3BytecodeConstants (thanks tty). =============== Diff against VMMaker.oscog-dtl.582 =============== Item was changed: ----- Method: SpurMemoryManager>>allocateMemoryOfSize:newSpaceSize:stackSize:codeSize: (in category 'spur bootstrap') ----- allocateMemoryOfSize: memoryBytes newSpaceSize: newSpaceBytes stackSize: stackBytes codeSize: codeBytes "Intialize the receiver for bootsraping an image. Set up a large oldSpace and an empty newSpace and set-up freeStart and scavengeThreshold to allocate in oldSpace. Later on (in initializePostBootstrap) freeStart and scavengeThreshold will be set to sane values." <doNotGenerate> self assert: (memoryBytes \\ self allocationUnit = 0 and: [newSpaceBytes \\ self allocationUnit = 0 and: [codeBytes \\ self allocationUnit = 0]]). memory := (self endianness == #little ifTrue: [LittleEndianBitmap] ifFalse: [Bitmap]) new: (memoryBytes + newSpaceBytes + codeBytes + stackBytes) // 4. newSpaceStart := codeBytes + stackBytes. endOfMemory := freeOldSpaceStart := memoryBytes + newSpaceBytes + codeBytes + stackBytes. "leave newSpace empty for the bootstrap" freeStart := newSpaceBytes + newSpaceStart. oldSpaceStart := newSpaceLimit := newSpaceBytes + newSpaceStart. scavengeThreshold := memory size * 4. "Bitmap is a 4-byte per word array" scavenger := SpurGenerationScavengerSimulator new. scavenger manager: self. scavenger newSpaceStart: newSpaceStart newSpaceBytes: newSpaceBytes + edenBytes: newSpaceBytes + * (self scavengerDenominator - self numSurvivorSpaces) + // self scavengerDenominator! - edenBytes: newSpaceBytes * self scavengerDenominator - - self numSurvivorSpaces // self scavengerDenominator! Item was changed: + SharedPool subclass: #VMSqueakV3BytecodeConstants - VMBasicConstants subclass: #VMSqueakV3BytecodeConstants instanceVariableNames: '' classVariableNames: 'CtxtTempFrameStart LargeContextBit LargeContextSize LargeContextSlots SmallContextSize SmallContextSlots' poolDictionaries: 'VMBasicConstants' category: 'VMMaker-Interpreter'! !VMSqueakV3BytecodeConstants commentStamp: '<historical>' prior: 0! self ensureClassPool. #(CtxtTempFrameStart LargeContextBit LargeContextSize SmallContextSize) do: [:k| self classPool declare: k from: ObjectMemory classPool]!

1 0

Simulating the BalloonEnginePlugin, FloatArrayPlugin & Matrix2x3Plugin primitives
by Eliot Miranda 13 Jan '14

13 Jan '14

Hi All, I'm just revising plugin treatment in Spur and came across this old snippet of mysterious code: InterpreterSimulator>>loadNewPlugin: pluginString | plugin simClass | transcript cr; show:'Looking for module ', pluginString. (#('FloatArrayPlugin' 'Matrix2x3Plugin') includes: pluginString) ifTrue: [transcript show: ' ... defeated'. ^ nil]. In the past I got as far as rewriting it to read... InterpreterSimulator>>loadNewPlugin: pluginString | plugin plugins simulatorClasses | transcript cr; show: 'Looking for module ', pluginString. "but *why*??" (#('FloatArrayPlugin' 'Matrix2x3Plugin') includes: pluginString) ifTrue: [transcript show: ' ... defeated'. ^nil]. plugins := InterpreterPlugin allSubclasses select: [:psc| psc moduleName asString = pluginString asString]. In revising the code for Spur I removed the defeat code and found out more. It's essentially because the BalloonPlugin has difficulty simulating accesses of 32-bit floats. If you simply defeat the code and let things run soon you get failures in FloatArrayPlugin & Matrix2x3Plugin primitives. These can be fixed by implementing the following in the FloatArrayPlugin & Matrix2x3Plugin: cCoerce: value to: cType ^cType = 'float' ifTrue: [value asIEEE32BitWord] ifFalse: [value] But soon you hit more difficult failures in the BalloonEnginePlugin, e.g. in BalloonEngineBase>>transformPointX: xValue y: yValue into: dstPoint "Transform srcPoint into dstPoint by using the currently loaded matrix" "Note: This should be rewritten so that inlining works (e.g., removing the declarations and adding argument coercions at the appropriate points)" | x y transform | <inline: true> <var: #dstPoint type:'int *'> <var: #xValue type: 'double '> <var: #yValue type: 'double '> <var: #transform type:'float *'> transform := self edgeTransform. x := ((((transform at: 0) * xValue) + ((transform at: 1) * yValue) + (transform at: 2)) * self aaLevelGet asFloat) asInteger. y := ((((transform at: 3) * xValue) + ((transform at: 4) * yValue) + (transform at: 5)) * self aaLevelGet asFloat) asInteger. dstPoint at: 0 put: x. dstPoint at: 1 put: y. where x and y end up being the integer representation of 64-bit floats while dstPoint accepts the integer representation of 32-bit floats. At least I think that's what's going on. In any case I need to focus on Spur and can't spare the time to fix this. But I find it unsatisfactory. It means the VM simulation isn't accurate. In the simulation the primitives fail and Smalltalk code is run. In the real VM the primitives work. And that's deeply unsatisfying. So if there's anyone itching for a VM challenge try and make the BalloonEnginePlugin, FloatArrayPlugin & Matrix2x3Plugin primitives simulate correctly, removing the defeat code above. That would be a great new year's gift. -- best, Eliot

5 9

Fwd: [Pharo-dev] Pharo 3.0 not responding to mouse or keyboard after launch
by Nicolas Cellier 13 Jan '14

13 Jan '14

---------- Forwarded message ---------- From: Martin McClure <martin(a)hand2mouse.com> Date: 2014/1/13 Subject: Re: [Pharo-dev] Pharo 3.0 not responding to mouse or keyboard after launch To: Pharo Development List <pharo-dev(a)lists.pharo.org> On 01/12/2014 10:18 PM, Hernán Morales Durand wrote: > That sounds really weird. Having to launch from GUI to start a working > image is not very convenient. > Let us know if you have any other findings. > Thanks. After some digging, I think I've got it. The pharo executable is launched by the bash shell via a fork followed by an execve. The signal mask is inherited from the parent process, and preserved across the execve. Pharo does not modify the signal mask except once: rt_sigprocmask(SIG_UNBLOCK, [RTMIN RT_1], NULL, 8) = 0 which only appears to deal with one real-time signal. In my case, somehow one set of shells has SIGALRM masked, and another set of shells does not have it masked. Pharo seems to rely on SIGALRMs from the interval timer to wake it up periodically (every 2 ms) presumably to see whether it has any work to do. So no SIGALRMS delivered, not much happens. I have no idea why my shells are masking various signals, but it seems clear that it would be a good idea for the VM to initialize its signal mask explicitly rather than depending on the parent process to have it set sanely. So I count this one as a VM bug. If someone better connected with the VM community would report it as such, I'd appreciate it. Thanks for all the suggestions while I dug to the bottom of this one. Regards, -Martin

1 0

Re: [Pharo-dev] Arguments to --trace=?
by Eliot Miranda 13 Jan '14

13 Jan '14

On Sun, Jan 12, 2014 at 11:43 AM, Martin McClure <martin(a)hand2mouse.com>wrote: > Anybody know where to find what the acceptable arguments to --trace on the > command line are, and what each means? > > So far, I've tried: > > --trace Lots of output > --trace=0 No output > --trace=1 Looks maybe the same as --trace with no argument > --trace=2 No output > --trace=3 A whaling big lot of very interesting output > > Slightly better descriptions of these would be nice. :-) > Cogit>>sendTrace: aBooleanOrInteger <doNotGenerate> "traceFlags is a set of flags. 1 => print trace (if something below is selected) 2 => trace sends 4 => trace block activations 8 => trace interpreter primitives 16 => trace events (context switches, GCs, etc) 32 => trace stack overflow 64 => send breakpoint on implicit receiver (Newspeak VM only)" traceFlags := aBooleanOrInteger isInteger ifTrue: [aBooleanOrInteger] ifFalse: [aBooleanOrInteger ifTrue: [6] ifFalse: [0]] -- best, Eliot

2 1

Re: [squeak-dev] Squeak on Raspberry pi
by Eliot Miranda 13 Jan '14

13 Jan '14

Hi Tim, On Thu, Dec 26, 2013 at 10:54 AM, tim Rowledge <tim(a)rowledge.org> wrote: > > On 26-12-2013, at 7:11 AM, marcelo Cortez <jmdc_marcelo(a)yahoo.com.ar> > wrote: > > > hi > > > > I'm developing over Raspberry pi with squeak and i need access to GPIO. > > > > Questions: > > > > How load FFI on Raspberry pi? > > Any link,paper , advice , pdf. > > be appreciated. > > To get the FFI working for Pi (and indeed other ARM *nix machines) > somebody would need to write any needed ARM assembler bits to interface to > the apicall and/or libffi and/or whatever the current facility is called. > There is some information on what is needed in the vm sources; see > http://squeakvm.org/cgi-bin/viewvc.cgi/squeak/trunk/platforms/unix/plugins/… start with 00README. Probably the best place to ask more specific > questions about FFI would be the squeak vm-dev list (sign up at > http://lists.squeakfoundation.org/mailman/listinfo/vm-dev) > Actually it is simpler than this, provided one starts from ThreadedFFIPlugin. This is a replacement for the old FFIPlugin that uses very little assembler, and that in the form of asm statements. The old FFIPlugin has two main problems, first that it needs a lots of assembler support, and second that it is not reentrant. The latter follows from the former, in that the marshalling is done to a static buffer, and so making a call while nested will screw the pooch. ThreadedFFIPlugin in contrast uses alloca to allocate space for outgoing arguments and is hence reentrant and written in C with two asm statements, getsp and setsp. Better still ThreadedFFIPlugin was written with ARM (and PowerPC) in mind. It has three subclasses, ThreadedIA32FFIPlugin, ThreadedARMFFIPlugin, & ThreadedPPCBEFFIPlugin. The first is fully functional (and has been in Cog since its release). The second two are only a few days away from completion. Let me invite anyone interested to have a go. The secret to an alloca based implementation is that alloca, answering a stack-allocated array, provides space for outgoing arguments, so that subsequently calling a function pointer supplies he called function with its arguments. This is slightly more complicated on an ABI with register arguments, such as ARM or PowerPC. The extra work is to also marshal into a struct that holds the arguments, and instead of just calling the function pointer, one calls it with enough arguments to fill the register arguments, taken from the struct. All the structure is there. All it needs is someone with am ARM and some gumption to fill in the missing pieces. I know all this works because I wrote (and/or rewrite) the VisualWorks VM's FFI to use alloca, including for ARM and PowerPC platforms. It’s definitely a job I have on my list of TO DO, but not high and there’s > plenty of work piled up above it so please feel free to tackle it! > > It *might* be easier in the short term to write a vm plugin specifically > for the Pi GPIO interface. You can find out quite a bit about the gpio > programming fro mthe Pi forums and particularly from the Scratch forum > where simplesi has done a great deal of clever stuff by using python to > provide a connection for the Scratch remote sensor connection subsystem, > and then driving the gpio from pythin. It’s certainly time there was as > more direct interface for him to use. > It might. But someone who understands the ARM ABI could probably get the ThreadedARMFFIPlugin working in a week or less. I'll happily answer any and all questions in getting this to work. -- best, Eliot

1 0

Re: [squeak-dev] The Trunk: System-cwp.660.mcz
by Eliot Miranda 12 Jan '14

12 Jan '14

Hi All, On Sat, Jan 11, 2014 at 1:51 PM, Florin Mateoc <florin.mateoc(a)gmail.com>wrote: > On 1/11/2014 4:29 PM, Colin Putney wrote: > > > > > On Sat, Jan 11, 2014 at 12:11 PM, Florin Mateoc <florin.mateoc(a)gmail.com>wrote: > > >> I would think that materializing proxies or otherwise creating new >> objects within an allObjectsDo: loop is a bug, just >> as it usually is whenever one grows a collection while iterating over >> it. It is the responsibility of the caller to >> ensure that this does not happen. >> > > If that's the case, then the caller may not send any messages to the > objects enumerated. That seems overly restrictive to me. > > Colin > > > > > I am curious how would you implement #nextObject so that you could iterate > over all objects in an image even if you create new objects after the first > call to #nextObject. > The bug is in implementing allObjects in terms of someObject and nextObject in the first place. It's cheap and cheerful but horribly error-prone and restrictive. It's cheap because the collection of objects doesn't have to be created, and on the original 16-bit Smalltalk machines that was really important. It's horribly restrictive because it assumes much about the implementation. Before closures a sentinel wasn't even needed because enumerating the block didn't create a new object (the block context was reused). So the code had to be rewritten just to support closures. Spur has a generation scavenger operating in a distinct new space and that doesn't jive well with a consistent ordering at all. So far the system is limping along by tenuring all objects on someObject and someInstance (so that newSpace is either empty, or doesn't contain any instances of a specific class) and having nextObject enumerate only objects in oldSpace. But I think now we can afford a primitive that answers all the objects (remember that average object size means that such a collection will be ~ 10% of the heap, average object size in Squeak V3 is about 10.6 words). At least that's what Spur will do, along with an allInstancesOf: primitive. And then the become example won't cause any problems at all. Far more reliable. I suppose there are circumstances when enumerating without a container is the only feasible approach, but VisualWorks has got along with only an allObjects primitive for a long time now. I suspect we can too. -- best, Eliot

1 0

OT - Theodor RE: [Vm-dev] SqueakSSLPlugin
by Ron Teitelbaum 11 Jan '14

11 Jan '14

> David T. Lewis > > On Fri, Jan 10, 2014 at 10:30:47AM -0800, Eliot Miranda wrote: > > > > On Fri, Jan 10, 2014 at 9:45 AM, David T. Lewis < <mailto:lewis@mail.msen.com> lewis(a)mail.msen.com> > wrote: > > > > > > > > In this case I wonder if it might make more sense to move the plugin > > > into the VMMaker repository. The SqueakSSLPlugin is complete and it > > > seems unlikely to need any active development aside from minor > > > updates such as the one Eliot is posting here. > > > > > > Normally I would discourage moving plugins into VMMaker if they are > > > part of any active project, but this seems like a case it which in > > > which a separate repository is not needed, and it may be easier for > > > everyone to give it a home along with the other stable plugins. > > > > > > Eliot, is that OK with you? > > > > > > > Yes, that's fine with me. > > > > Done. > > Thank you Andreas. > Dave >

1 0

SqueakSSLPlugin
by Eliot Miranda 11 Jan '14

11 Jan '14

Hi All, who has write rights to http://www.squeaksource.com/SqueakSSL? I don't :-(. Here's a pragmatized version of the plugin. Can someone either put it in place and/or give me write permission? -- TIA, Eliot

5 9

VM Maker: VMMaker.oscog-dtl.582.mcz
by commits＠source.squeak.org 11 Jan '14

11 Jan '14

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-dtl.582.mcz ==================== Summary ==================== Name: VMMaker.oscog-dtl.582 Author: dtl Time: 10 January 2014, 6:08:06.073 pm UUID: 652ff21a-50cf-4a20-a671-0a508079fc26 Ancestors: VMMaker.oscog-eem.581 Add SqueakSSLPlugin to VMMaker. Pragmatize the plugin's primitives. SqueakSSLPlugin is a platform SSL interface for Squeak by Andreas Raab. The original source repository is at http://www.squeaksource.com/SqueakSSL. This is the original source from SqueakSSL-Plugin-ar.3 with category changed to VMMaker-Plugins. License: This project is covered by the MIT License: Copyright (c) 2010 Andreas Raab and Contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. =============== Diff against VMMaker.oscog-eem.581 =============== Item was added: + InterpreterPlugin subclass: #SqueakSSLPlugin + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Plugins'! Item was added: + ----- Method: SqueakSSLPlugin class>>hasHeaderFile (in category 'translation') ----- + hasHeaderFile + ^true! Item was added: + ----- Method: SqueakSSLPlugin class>>moduleName (in category 'translation') ----- + moduleName + ^'SqueakSSL'! Item was added: + ----- Method: SqueakSSLPlugin>>primitiveAccept (in category 'primitives') ----- + primitiveAccept + "Primitive. Starts or continues a server handshake using the current session. + Will eventually produce output to be sent to the client. Requires the host + and cert name to be set for the session. Returns a code indicating the sate + of the connection: + > 0 - Number of bytes to be sent to the client. + 0 - Success. The connection is established. + -1 - More input is required. + < -1 - Other errors. + " + | start srcLen dstLen srcOop dstOop handle srcPtr dstPtr result | + <var: #srcPtr type: 'char *'> + <var: #dstPtr type: 'char *'> + <export: true> + interpreterProxy methodArgumentCount = 5 + ifFalse:[^interpreterProxy primitiveFail]. + dstOop := interpreterProxy stackObjectValue: 0. + srcLen := interpreterProxy stackIntegerValue: 1. + start := interpreterProxy stackIntegerValue: 2. + srcOop := interpreterProxy stackObjectValue: 3. + handle := interpreterProxy stackIntegerValue: 4. + interpreterProxy failed ifTrue:[^nil]. + ((start > 0 and:[srcLen >= 0]) + and:[(interpreterProxy isBytes: srcOop) + and:[(interpreterProxy isBytes: dstOop) + and:[(interpreterProxy byteSizeOf: srcOop) >= (start + srcLen - 1)]]]) + ifFalse:[^interpreterProxy primitiveFail]. + srcPtr := interpreterProxy firstIndexableField: srcOop. + dstPtr := interpreterProxy firstIndexableField: dstOop. + srcPtr := srcPtr + start - 1. + dstLen := interpreterProxy byteSizeOf: dstOop. + result := self cCode: 'sqAcceptSSL(handle, srcPtr, srcLen, dstPtr, dstLen)' + inSmalltalk:[handle. srcPtr. srcLen. dstPtr. dstLen. -2]. + interpreterProxy failed ifTrue:[^nil]. + interpreterProxy pop: interpreterProxy methodArgumentCount+1. + interpreterProxy pushInteger: result.! Item was added: + ----- Method: SqueakSSLPlugin>>primitiveConnect (in category 'primitives') ----- + primitiveConnect + "Primitive. Starts or continues a client handshake using the provided data. + Will eventually produce output to be sent to the server. Requires the host + name to be set for the session. + Returns: + > 0 - Number of bytes to be sent to the server + 0 - Success. The connection is established. + -1 - More input is required. + < -1 - Other errors. + " + | start srcLen dstLen srcOop dstOop handle srcPtr dstPtr result | + <var: #srcPtr type: 'char *'> + <var: #dstPtr type: 'char *'> + <export: true> + interpreterProxy methodArgumentCount = 5 + ifFalse:[^interpreterProxy primitiveFail]. + dstOop := interpreterProxy stackObjectValue: 0. + srcLen := interpreterProxy stackIntegerValue: 1. + start := interpreterProxy stackIntegerValue: 2. + srcOop := interpreterProxy stackObjectValue: 3. + handle := interpreterProxy stackIntegerValue: 4. + interpreterProxy failed ifTrue:[^nil]. + ((start > 0 and:[srcLen >= 0]) + and:[(interpreterProxy isBytes: srcOop) + and:[(interpreterProxy isBytes: dstOop) + and:[(interpreterProxy byteSizeOf: srcOop) >= (start + srcLen - 1)]]]) + ifFalse:[^interpreterProxy primitiveFail]. + srcPtr := interpreterProxy firstIndexableField: srcOop. + dstPtr := interpreterProxy firstIndexableField: dstOop. + srcPtr := srcPtr + start - 1. + dstLen := interpreterProxy byteSizeOf: dstOop. + result := self cCode: 'sqConnectSSL(handle, srcPtr, srcLen, dstPtr, dstLen)' + inSmalltalk:[handle. srcPtr. srcLen. dstPtr. dstLen. -2]. + interpreterProxy failed ifTrue:[^nil]. + interpreterProxy pop: interpreterProxy methodArgumentCount+1. + interpreterProxy pushInteger: result.! Item was added: + ----- Method: SqueakSSLPlugin>>primitiveCreate (in category 'primitives') ----- + primitiveCreate + "Primitive. Creates a new SSL session and returns its handle." + | handle | + <export: true> + interpreterProxy methodArgumentCount = 0 + ifFalse:[^interpreterProxy primitiveFail]. + handle := self cCode: 'sqCreateSSL()' inSmalltalk:[0]. + handle = 0 ifTrue:[^interpreterProxy primitiveFail]. + interpreterProxy pop: interpreterProxy methodArgumentCount+1. + interpreterProxy pushInteger: handle. + ! Item was added: + ----- Method: SqueakSSLPlugin>>primitiveDecrypt (in category 'primitives') ----- + primitiveDecrypt + "Primitive. Decrypts a buffer sent via the connection. + Requires the session to be established. + Returns: + >=0 - Number of bytes decrypted in the result buffer + < -1 - Other errors. + " + | start srcLen dstLen srcOop dstOop handle srcPtr dstPtr result | + <var: #srcPtr type: 'char *'> + <var: #dstPtr type: 'char *'> + <export: true> + interpreterProxy methodArgumentCount = 5 + ifFalse:[^interpreterProxy primitiveFail]. + dstOop := interpreterProxy stackObjectValue: 0. + srcLen := interpreterProxy stackIntegerValue: 1. + start := interpreterProxy stackIntegerValue: 2. + srcOop := interpreterProxy stackObjectValue: 3. + handle := interpreterProxy stackIntegerValue: 4. + interpreterProxy failed ifTrue:[^nil]. + ((start > 0 and:[srcLen >= 0]) + and:[(interpreterProxy isBytes: srcOop) + and:[(interpreterProxy isBytes: dstOop) + and:[(interpreterProxy byteSizeOf: srcOop) >= (start + srcLen - 1)]]]) + ifFalse:[^interpreterProxy primitiveFail]. + srcPtr := interpreterProxy firstIndexableField: srcOop. + dstPtr := interpreterProxy firstIndexableField: dstOop. + srcPtr := srcPtr + start - 1. + dstLen := interpreterProxy byteSizeOf: dstOop. + result := self cCode: 'sqDecryptSSL(handle, srcPtr, srcLen, dstPtr, dstLen)' + inSmalltalk:[handle. srcPtr. srcLen. dstPtr. dstLen. -2]. + interpreterProxy failed ifTrue:[^nil]. + interpreterProxy pop: interpreterProxy methodArgumentCount+1. + interpreterProxy pushInteger: result.! Item was added: + ----- Method: SqueakSSLPlugin>>primitiveDestroy (in category 'primitives') ----- + primitiveDestroy + "Primitive. Destroys an SSL session." + + | handle result | + <export: true> + interpreterProxy methodArgumentCount = 1 + ifFalse:[^interpreterProxy primitiveFail]. + handle := interpreterProxy stackIntegerValue: 0. + interpreterProxy failed ifTrue:[^nil]. + result := self cCode: 'sqDestroySSL(handle)' inSmalltalk:[handle. 0]. + result = 0 ifTrue:[^interpreterProxy primitiveFail]. + interpreterProxy pop: interpreterProxy methodArgumentCount. + + ! Item was added: + ----- Method: SqueakSSLPlugin>>primitiveEncrypt (in category 'primitives') ----- + primitiveEncrypt + "Primitive. Encrypts a buffer to be sent to the via the connection. + Requires the session to be established. + Returns: + >=0 - Number of bytes encrypted in the result buffer + < -1 - Other errors. + " + | start srcLen dstLen srcOop dstOop handle srcPtr dstPtr result | + <var: #srcPtr type: 'char *'> + <var: #dstPtr type: 'char *'> + <export: true> + interpreterProxy methodArgumentCount = 5 + ifFalse:[^interpreterProxy primitiveFail]. + dstOop := interpreterProxy stackObjectValue: 0. + srcLen := interpreterProxy stackIntegerValue: 1. + start := interpreterProxy stackIntegerValue: 2. + srcOop := interpreterProxy stackObjectValue: 3. + handle := interpreterProxy stackIntegerValue: 4. + interpreterProxy failed ifTrue:[^nil]. + ((start > 0 and:[srcLen >= 0]) + and:[(interpreterProxy isBytes: srcOop) + and:[(interpreterProxy isBytes: dstOop) + and:[(interpreterProxy byteSizeOf: srcOop) >= (start + srcLen - 1)]]]) + ifFalse:[^interpreterProxy primitiveFail]. + srcPtr := interpreterProxy firstIndexableField: srcOop. + dstPtr := interpreterProxy firstIndexableField: dstOop. + srcPtr := srcPtr + start - 1. + dstLen := interpreterProxy byteSizeOf: dstOop. + result := self cCode: 'sqEncryptSSL(handle, srcPtr, srcLen, dstPtr, dstLen)' + inSmalltalk:[handle. srcPtr. srcLen. dstPtr. dstLen. -2]. + interpreterProxy failed ifTrue:[^nil]. + interpreterProxy pop: interpreterProxy methodArgumentCount+1. + interpreterProxy pushInteger: result.! Item was added: + ----- Method: SqueakSSLPlugin>>primitiveGetIntProperty (in category 'primitives') ----- + primitiveGetIntProperty + "Primitive. Returns an integer property for the session" + + | propID handle value | + <export: true> + interpreterProxy methodArgumentCount = 2 + ifFalse:[^interpreterProxy primitiveFail]. + propID := interpreterProxy stackIntegerValue: 0. + handle := interpreterProxy stackIntegerValue: 1. + interpreterProxy failed ifTrue:[^nil]. + value := self cCode: 'sqGetIntPropertySSL(handle, propID)' + inSmalltalk:[handle. propID. 0]. + interpreterProxy failed ifTrue:[^nil]. + interpreterProxy + pop: interpreterProxy methodArgumentCount + 1 + thenPush: (interpreterProxy signed32BitIntegerFor: value) + ! Item was added: + ----- Method: SqueakSSLPlugin>>primitiveGetStringProperty (in category 'primitives') ----- + primitiveGetStringProperty + "Primitive. Returns a string property for the session" + + | stringLen stringOop propID handle stringPtr oopPtr | + <var: #stringPtr type: 'char *'> + <var: #oopPtr type: 'char *'> + <export: true> + interpreterProxy methodArgumentCount = 2 + ifFalse:[^interpreterProxy primitiveFail]. + propID := interpreterProxy stackIntegerValue: 0. + handle := interpreterProxy stackIntegerValue: 1. + interpreterProxy failed ifTrue:[^nil]. + stringPtr := self cCode: 'sqGetStringPropertySSL(handle, propID)' + inSmalltalk:[handle. propID. nil]. + interpreterProxy failed ifTrue:[^nil]. + stringPtr == nil ifTrue:[ + stringOop := interpreterProxy nilObject. + ] ifFalse:[ + stringLen := self strlen: stringPtr. + stringOop := interpreterProxy + instantiateClass: (interpreterProxy classString) + indexableSize: stringLen. + oopPtr := interpreterProxy firstIndexableField: stringOop. + 0 to: stringLen-1 do:[:i| oopPtr at: i put: (stringPtr at: i)]. + ]. + interpreterProxy + pop: interpreterProxy methodArgumentCount + 1 + thenPush: stringOop. + ! Item was added: + ----- Method: SqueakSSLPlugin>>primitiveSetIntProperty (in category 'primitives') ----- + primitiveSetIntProperty + "Primitive. Sets a integer property for the session" + + | propID handle result value | + <export: true> + interpreterProxy methodArgumentCount = 3 + ifFalse:[^interpreterProxy primitiveFail]. + value := interpreterProxy signed32BitValueOf: (interpreterProxy stackValue: 0). + propID := interpreterProxy stackIntegerValue: 1. + handle := interpreterProxy stackIntegerValue: 2. + interpreterProxy failed ifTrue:[^nil]. + result := self cCode: 'sqSetIntPropertySSL(handle, propID, value)' + inSmalltalk:[handle. propID. value. false]. + result ifFalse:[^interpreterProxy primitiveFail]. + interpreterProxy failed ifTrue:[^nil]. + interpreterProxy pop: interpreterProxy methodArgumentCount. + ! Item was added: + ----- Method: SqueakSSLPlugin>>primitiveSetStringProperty (in category 'primitives') ----- + primitiveSetStringProperty + "Primitive. Sets a string property for the session" + + | srcLen srcOop propID handle srcPtr result | + <var: #srcPtr type: 'char *'> + <export: true> + interpreterProxy methodArgumentCount = 3 + ifFalse:[^interpreterProxy primitiveFail]. + srcOop := interpreterProxy stackObjectValue: 0. + propID := interpreterProxy stackIntegerValue: 1. + handle := interpreterProxy stackIntegerValue: 2. + interpreterProxy failed ifTrue:[^nil]. + (interpreterProxy isBytes: srcOop) + ifFalse:[^interpreterProxy primitiveFail]. + srcPtr := interpreterProxy firstIndexableField: srcOop. + srcLen := interpreterProxy byteSizeOf: srcOop. + result := self cCode: 'sqSetStringPropertySSL(handle, propID, srcPtr, srcLen)' + inSmalltalk:[handle. srcPtr. propID. srcLen. false]. + result ifFalse:[^interpreterProxy primitiveFail]. + interpreterProxy failed ifTrue:[^nil]. + interpreterProxy pop: interpreterProxy methodArgumentCount. + !

1 0

[commit][2844] VMMaker 4.12.13
by commits＠squeakvm.org 11 Jan '14

11 Jan '14

Revision: 2844 Author: lewis Date: 2014-01-10 15:00:31 -0800 (Fri, 10 Jan 2014) Log Message: ----------- VMMaker 4.12.13 FT2Plugin updates, move SqueakSSL to VMMaker with pragmatizing. FT2Plugin is separate from VMMaker, changes include pragmatizing (cosmetic impact only) and some functional update from Eliot. The SqueakSSL change is a package change (move to VMMaker) plus pragmatizing (cosmetic change only). Modified Paths: -------------- trunk/src/ckformat.c trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c trunk/src/plugins/AioPlugin/AioPlugin.c trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c trunk/src/plugins/B2DPlugin/B2DPlugin.c trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c trunk/src/plugins/BitBltPlugin/BitBltPlugin.c trunk/src/plugins/CameraPlugin/CameraPlugin.c trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c trunk/src/plugins/CroquetPlugin/CroquetPlugin.c trunk/src/plugins/DBusPlugin/DBusPlugin.c trunk/src/plugins/DSAPrims/DSAPrims.c trunk/src/plugins/DropPlugin/DropPlugin.c trunk/src/plugins/FFTPlugin/FFTPlugin.c trunk/src/plugins/FT2Plugin/FT2Plugin.c trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c trunk/src/plugins/FilePlugin/FilePlugin.c trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c trunk/src/plugins/GeniePlugin/GeniePlugin.c trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c trunk/src/plugins/Klatt/Klatt.c trunk/src/plugins/LargeIntegers/LargeIntegers.c trunk/src/plugins/LocalePlugin/LocalePlugin.c trunk/src/plugins/MIDIPlugin/MIDIPlugin.c trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c trunk/src/plugins/RePlugin/RePlugin.c trunk/src/plugins/RomePlugin/RomePlugin.c trunk/src/plugins/ScratchPlugin/ScratchPlugin.c trunk/src/plugins/SecurityPlugin/SecurityPlugin.c trunk/src/plugins/SerialPlugin/SerialPlugin.c trunk/src/plugins/SocketPlugin/SocketPlugin.c trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c trunk/src/plugins/SoundPlugin/SoundPlugin.c trunk/src/plugins/Squeak3D/Squeak3D.c trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c trunk/src/plugins/SqueakSSL/SqueakSSL.c trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c trunk/src/plugins/UUIDPlugin/UUIDPlugin.c trunk/src/plugins/UnicodePlugin/UnicodePlugin.c trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c trunk/src/plugins/WeDoPlugin/WeDoPlugin.c trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c trunk/src/plugins/ZipPlugin/ZipPlugin.c trunk/src/vm/interp.c trunk/src/vm/interp.h trunk/src/vm/sqNamedPrims.h Modified: trunk/src/ckformat.c =================================================================== --- trunk/src/ckformat.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/ckformat.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2014-01-04T14:04:16.401+01:00--- */ +/* --- Automatically generated from class ImageFormat 2014-01-10T17:30:29.261+01:00--- */ /* --- Source code is in package ImageFormat in the VMMaker repository --- */ /* --- DO NOT EDIT THIS FILE --- */ Modified: trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c =================================================================== --- trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:35 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:49 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 from - ADPCMCodecPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + ADPCMCodecPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 */ -static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 4 January 2014 (i)" + "ADPCMCodecPlugin 10 January 2014 (i)" #else - "ADPCMCodecPlugin 4 January 2014 (e)" + "ADPCMCodecPlugin 10 January 2014 (e)" #endif ; Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:04:14 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30:26 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 from UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.15 uuid: 0029df1c-3720-4b61-8579-4851417d24a7 */ @@ -88,9 +88,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin 4 January 2014 (i)" + "AioPlugin 10 January 2014 (i)" #else - "AioPlugin 4 January 2014 (e)" + "AioPlugin 10 January 2014 (e)" #endif ; Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:35 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:50 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + SmartSyntaxPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 from - AsynchFilePlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + AsynchFilePlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 4 January 2014 (i)" + "AsynchFilePlugin 10 January 2014 (i)" #else - "AsynchFilePlugin 4 January 2014 (e)" + "AsynchFilePlugin 10 January 2014 (e)" #endif ; static void * sCOAFfn; Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:39 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:54 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 from - BalloonEnginePlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + BalloonEnginePlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; @@ -447,9 +447,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 4 January 2014 (i)" + "B2DPlugin 10 January 2014 (i)" #else - "B2DPlugin 4 January 2014 (e)" + "B2DPlugin 10 January 2014 (e)" #endif ; static int* objBuffer; Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:58 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30:12 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 from - B3DAcceleratorPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + B3DAcceleratorPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 */ -static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ; +static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; @@ -107,9 +107,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 4 January 2014 (i)" + "B3DAcceleratorPlugin 10 January 2014 (i)" #else - "B3DAcceleratorPlugin 4 January 2014 (e)" + "B3DAcceleratorPlugin 10 January 2014 (e)" #endif ; Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:36 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:50 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 from - BMPReadWriterPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + BMPReadWriterPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; @@ -58,9 +58,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 4 January 2014 (i)" + "BMPReadWriterPlugin 10 January 2014 (i)" #else - "BMPReadWriterPlugin 4 January 2014 (e)" + "BMPReadWriterPlugin 10 January 2014 (e)" #endif ; Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:41 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:56 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + SmartSyntaxPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 from - BitBltSimulation VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + BitBltSimulation VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 */ -static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; @@ -256,9 +256,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 4 January 2014 (i)" + "BitBltPlugin 10 January 2014 (i)" #else - "BitBltPlugin 4 January 2014 (e)" + "BitBltPlugin 10 January 2014 (e)" #endif ; static sqInt nWords; Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:59 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30:14 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 from - CameraPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + CameraPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 */ -static char __buildInfo[] = "CameraPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ; +static char __buildInfo[] = "CameraPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; @@ -64,9 +64,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 4 January 2014 (i)" + "CameraPlugin 10 January 2014 (i)" #else - "CameraPlugin 4 January 2014 (e)" + "CameraPlugin 10 January 2014 (e)" #endif ; Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:04 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30:14 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + SmartSyntaxPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 from - ClipboardExtendedPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + ClipboardExtendedPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 */ -static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ; +static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 4 January 2014 (i)" + "ClipboardExtendedPlugin 10 January 2014 (i)" #else - "ClipboardExtendedPlugin 4 January 2014 (e)" + "ClipboardExtendedPlugin 10 January 2014 (e)" #endif ; Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c =================================================================== --- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:42 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:57 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 from - CroquetPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + CroquetPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 */ -static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ; +static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; @@ -73,9 +73,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CroquetPlugin 4 January 2014 (i)" + "CroquetPlugin 10 January 2014 (i)" #else - "CroquetPlugin 4 January 2014 (e)" + "CroquetPlugin 10 January 2014 (e)" #endif ; Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c =================================================================== --- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:04:01 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30:15 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + SmartSyntaxPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 from DBusPlugin DBus-Plugin-dtl.35 uuid: 2ae30f08-4793-4acb-876b-c443a5f5e665 */ @@ -143,9 +143,9 @@ static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH]; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DBusPlugin 4 January 2014 (i)" + "DBusPlugin 10 January 2014 (i)" #else - "DBusPlugin 4 January 2014 (e)" + "DBusPlugin 10 January 2014 (e)" #endif ; static DBusMessage* writeMessage; Modified: trunk/src/plugins/DSAPrims/DSAPrims.c =================================================================== --- trunk/src/plugins/DSAPrims/DSAPrims.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/DSAPrims/DSAPrims.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:42 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:57 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 from - DSAPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + DSAPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 */ -static char __buildInfo[] = "DSAPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ; +static char __buildInfo[] = "DSAPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims 4 January 2014 (i)" + "DSAPrims 10 January 2014 (i)" #else - "DSAPrims 4 January 2014 (e)" + "DSAPrims 10 January 2014 (e)" #endif ; static sqInt remainderDigitCount; Modified: trunk/src/plugins/DropPlugin/DropPlugin.c =================================================================== --- trunk/src/plugins/DropPlugin/DropPlugin.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/DropPlugin/DropPlugin.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:44 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:59 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 from - DropPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + DropPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 */ -static char __buildInfo[] = "DropPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ; +static char __buildInfo[] = "DropPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin 4 January 2014 (i)" + "DropPlugin 10 January 2014 (i)" #else - "DropPlugin 4 January 2014 (e)" + "DropPlugin 10 January 2014 (e)" #endif ; Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c =================================================================== --- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:44 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:59 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 from - FFTPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f + FFTPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 */ -static char __buildInfo[] = "FFTPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ; +static char __buildInfo[] = "FFTPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FFTPlugin 4 January 2014 (i)" + "FFTPlugin 10 January 2014 (i)" #else - "FFTPlugin 4 January 2014 (e)" + "FFTPlugin 10 January 2014 (e)" #endif ; static sqInt nu; Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c =================================================================== --- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2014-01-10 21:57:32 UTC (rev 2843) +++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2014-01-10 23:00:31 UTC (rev 2844) @@ -1,4 +1,4 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:45 pm */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30 pm */ /* Automatically generated by FT2PluginCodeGenerator * FreeType-nice.442 uuid: 9895a884-7d42-4783-9fb8-1a71ef244e16 from @@ -47,6 +47,7 @@ #define FT2GlyphSlotInstSize 17 #define FT2OutlineContoursIndex 4 #define FT2OutlineContoursSizeIndex 0 +#define FT2OutlineFlagsIndex 5 #define FT2OutlineInstSize 6 #define FT2OutlinePointsIndex 2 #define FT2OutlinePointsSizeIndex 1 @@ -77,7 +78,6 @@ EXPORT(sqInt) primitiveDoneFacePreserveFields(void); EXPORT(sqInt) primitiveEmboldenFaceGlyphSlotOutline(void); EXPORT(sqInt) primitiveErrorCode(void); -EXPORT(sqInt) primitiveErrorString(void); EXPORT(sqInt) primitiveFreeExternalMemory(void); EXPORT(sqInt) primitiveGetFaceCharIndex(void); EXPORT(sqInt) primitiveGetFaceCharMap(void); @@ -121,9 +121,9 @@ static FT_Library library; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FT2Plugin 4 January 2014 (i)" + "FT2Plugin 10 January 2014 (i)" #else - "FT2Plugin 4 January 2014 (e)" + "FT2Plugin 10 January 2014 (e)" #endif ; @@ -220,7 +220,7 @@ if (interpreterProxy->failed()) { return null; } - btw = BYTES_PER_WORD; + btw = wordSize(); return *(void**)(pointerForOop(oop + btw)); } @@ -378,12 +378,8 @@ EXPORT(sqInt) initialiseModule(void) { - /* not implemented?? commented out because of compilation errors - - self ifDefined: 'macintoshSqueak' then: [ - self fetchPreferences. - ]. - */ + /* not implemented?? commented out because of compilation errors */ + /* self ifDefined: 'macintoshSqueak' then: [self fetchPreferences]. */ library = null; errorCode = FT_Init_FreeType(&library); @@ -395,13 +391,18 @@ sqInt rcvr; size_t byteSize; char *aByteArray; + sqInt _return_value; interpreterProxy->success(interpreterProxy->isBytes(interpreterProxy->stackValue(0))); aByteArray = ((char *) (interpreterProxy->firstIndexableField(interpreterProxy->stackValue(0)))); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FreeTypeExternalMemory")); rcvr = interpreterProxy->stackValue(1); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(2, _return_value); return null; } ; @@ -415,8 +416,7 @@ memcpy(aPointer,aByteArray,byteSize); ftAllocateHandleInReceiverForPointer(aPointer); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(1); return null; @@ -430,11 +430,16 @@ sqInt rcvr; sqInt i; FT_Face face; + sqInt _return_value; interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face")); rcvr = interpreterProxy->stackValue(0); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(1, _return_value); return null; } face = ftHandleValueFromReceiver(rcvr); @@ -452,8 +457,7 @@ } interpreterProxy->success(errorCode == 0); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } return null; } @@ -467,11 +471,16 @@ EXPORT(sqInt) primitiveDoneFacePreserveFields(void) { sqInt rcvr; FT_Face face; + sqInt _return_value; interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face")); rcvr = interpreterProxy->stackValue(0); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(1, _return_value); return null; } face = ftHandleValueFromReceiver(rcvr); @@ -487,8 +496,7 @@ interpreterProxy->storePointerofObjectwithValue(0, rcvr, interpreterProxy->nilObject()); interpreterProxy->success(errorCode == 0); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } return null; } @@ -501,12 +509,17 @@ sqInt rcvr; FT_Face face; sqInt strength; + sqInt _return_value; strength = interpreterProxy->stackIntegerValue(0); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face")); rcvr = interpreterProxy->stackValue(1); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(2, _return_value); return null; } face = ftHandleValueFromReceiver(rcvr); @@ -520,8 +533,7 @@ return null; } if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(1); return null; @@ -535,54 +547,25 @@ _return_value = interpreterProxy->positive32BitIntegerFor((FT_ERROR_BASE(errorCode))); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->popthenPush(1, _return_value); return null; } -EXPORT(sqInt) primitiveErrorString(void) { - const char *str; - const struct ftError *ftError; - - -struct ftError { int errCode; const char* errMsg; }; -#undef __FTERRORS_H__ -#define FT_ERRORDEF( e, v, s ) { e, s }, -#define FT_ERROR_START_LIST { -#define FT_ERROR_END_LIST { 0xFF, "Bad Squeak Method Parameter" }, { 0, NULL } }; -static const struct ftError ftErrors[] = -#include FT_ERRORS_H -; - ftError = ftErrors; - ; - while (((str = ftError->errMsg)) && (FT_ERROR_BASE(errorCode) != ftError->errCode)) { - ftError++; - } - ; - if (!(str)) { - interpreterProxy->success(0); - } - if (interpreterProxy->failed()) { - return null; - } - interpreterProxy->popthenPush(1, ftAllocateStringForPointer(str)); - if (interpreterProxy->failed()) { - ftParameterError(); - return null; - } - return null; -} - EXPORT(sqInt) primitiveFreeExternalMemory(void) { sqInt rcvr; void*memPointer; + sqInt _return_value; interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FreeTypeExternalMemory")); rcvr = interpreterProxy->stackValue(0); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(1, _return_value); return null; } ; @@ -595,8 +578,7 @@ free(memPointer); } if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } return null; } @@ -617,7 +599,11 @@ interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face")); rcvr = interpreterProxy->stackValue(1); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(2, _return_value); return null; } errorCode = 0; @@ -629,8 +615,7 @@ result = FT_Get_Char_Index(face, charIndex); _return_value = interpreterProxy->positive32BitIntegerFor(result); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->popthenPush(2, _return_value); return null; @@ -642,11 +627,16 @@ FT_CharMap charmap; sqInt stringOop; FT_Face face; + sqInt _return_value; interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face")); rcvr = interpreterProxy->stackValue(0); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(1, _return_value); return null; } face = ftHandleValueFromReceiver(rcvr); @@ -669,8 +659,7 @@ return null; } if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } return null; } @@ -684,13 +673,18 @@ sqInt arrayOop; sqInt rcvr; sqInt *array; + sqInt _return_value; interpreterProxy->success(interpreterProxy->isIndexable(interpreterProxy->stackValue(0))); array = ((int *) (interpreterProxy->firstIndexableField(interpreterProxy->stackValue(0)))); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face")); rcvr = interpreterProxy->stackValue(1); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(2, _return_value); return null; } face = ftHandleValueFromReceiver(rcvr); @@ -717,8 +711,7 @@ return null; } if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(1); return null; @@ -733,12 +726,17 @@ sqInt string; FT_Face face; sqInt glyphIndex; + sqInt _return_value; glyphIndex = interpreterProxy->stackIntegerValue(0); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face")); rcvr = interpreterProxy->stackValue(1); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(2, _return_value); return null; } face = ftHandleValueFromReceiver(rcvr); @@ -753,8 +751,7 @@ } string = ftAllocateStringForPointer(buffer); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->popthenPush(2, string); return null; @@ -768,6 +765,7 @@ FT_Face face; sqInt leftGlyph; sqInt rightGlyph; + sqInt _return_value; leftGlyph = interpreterProxy->stackIntegerValue(1); rightGlyph = interpreterProxy->stackIntegerValue(0); @@ -778,7 +776,11 @@ interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(2), "FT2Face")); rcvr = interpreterProxy->stackValue(2); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(3, _return_value); return null; } errorCode = 0; @@ -792,8 +794,7 @@ FT_Get_Kerning(face, leftGlyph, rightGlyph, kernMode, &result);; pointOop = interpreterProxy->makePointwithxValueyValue(result.x, result.y); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->popthenPush(3, pointOop); return null; @@ -807,11 +808,16 @@ sqInt rcvr; sqInt string; FT_Face face; + sqInt _return_value; interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face")); rcvr = interpreterProxy->stackValue(0); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(1, _return_value); return null; } buffer = 0; @@ -827,8 +833,7 @@ } string = ftAllocateStringForPointer(buffer); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->popthenPush(1, string); return null; @@ -848,7 +853,11 @@ interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face")); rcvr = interpreterProxy->stackValue(0); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(1, _return_value); return null; } buffer = 0; @@ -861,8 +870,7 @@ if (buffer == 0) { _return_value = interpreterProxy->integerObjectOf(-1); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->popthenPush(1, _return_value); return null; @@ -875,8 +883,7 @@ ; memcpy(extraByteArrayPtr, buffer, sizeof(TT_OS2)); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->popthenPush(1, returnedHandle); return null; @@ -887,10 +894,17 @@ FT_Face face; sqInt _return_value; + + /* ptr to struct */ + interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face")); rcvr = interpreterProxy->stackValue(0); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(1, _return_value); return null; } errorCode = 0; @@ -901,8 +915,7 @@ } _return_value = (((FT_HAS_KERNING( face )) << 1) | 1); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->popthenPush(1, _return_value); return null; @@ -913,18 +926,22 @@ EXPORT(sqInt) primitiveLibraryHandle(void) { sqInt rcvr; + sqInt _return_value; interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Library")); rcvr = interpreterProxy->stackValue(0); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(1, _return_value); return null; } errorCode = 0; ftAllocateHandleInReceiverForPointer(library); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } return null; } @@ -938,13 +955,18 @@ FT_Face face; sqInt index; sqInt flags; + sqInt _return_value; index = interpreterProxy->stackIntegerValue(1); flags = interpreterProxy->stackIntegerValue(0); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(2), "FT2Face")); rcvr = interpreterProxy->stackValue(2); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(3, _return_value); return null; } face = ftHandleValueFromReceiver(rcvr); @@ -958,8 +980,7 @@ return null; } if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(2); return null; @@ -971,13 +992,18 @@ sqInt rectOop; FT_Face face; sqInt aRectangle; + sqInt _return_value; interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "Rectangle")); aRectangle = interpreterProxy->stackValue(0); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face")); rcvr = interpreterProxy->stackValue(1); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(2, _return_value); return null; } rectOop = aRectangle; @@ -1010,8 +1036,7 @@ rectOop = interpreterProxy->popRemappableOop(); interpreterProxy->storePointerofObjectwithValue(1, rectOop, pointOop); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(1); return null; @@ -1025,11 +1050,16 @@ sqInt rcvr; sqInt strOop; FT_Face face; + sqInt _return_value; interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face")); rcvr = interpreterProxy->stackValue(0); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(1, _return_value); return null; } face = ftHandleValueFromReceiver(rcvr); @@ -1068,8 +1098,7 @@ interpreterProxy->storeIntegerofObjectwithValue(20, rcvr, face->underline_thickness); } if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } return null; } @@ -1079,13 +1108,18 @@ FT_Face face; sqInt index; sqInt flags; + sqInt _return_value; index = interpreterProxy->stackIntegerValue(1); flags = interpreterProxy->stackIntegerValue(0); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(2), "FT2Face")); rcvr = interpreterProxy->stackValue(2); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(3, _return_value); return null; } face = ftHandleValueFromReceiver(rcvr); @@ -1099,8 +1133,7 @@ return null; } if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(2); return null; @@ -1117,13 +1150,18 @@ FT_Face face; FT_Glyph_Format *gfPtr; sqInt aFace; + sqInt _return_value; interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face")); aFace = interpreterProxy->stackValue(0); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2GlyphSlot")); rcvr = interpreterProxy->stackValue(1); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(2, _return_value); return null; } errorCode = 0; @@ -1150,7 +1188,7 @@ interpreterProxy->pushRemappableOop(rcvr); gfOop = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classByteArray(), sizeof(FT_Glyph_Format)); ; - btw = BYTES_PER_WORD; + btw = wordSize(); gfPtr = (FT_Glyph_Format *) pointerForOop(gfOop + btw); ; if (interpreterProxy->failed()) { @@ -1170,8 +1208,7 @@ interpreterProxy->storeIntegerofObjectwithValue(14, rcvr, gs->metrics.vertBearingY); interpreterProxy->storeIntegerofObjectwithValue(15, rcvr, gs->metrics.vertAdvance); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(1); return null; @@ -1191,6 +1228,7 @@ sqInt contoursSize; long * points; sqInt aFace; + sqInt _return_value; sqInt array; sqInt array1; sqInt array2; @@ -1204,7 +1242,11 @@ interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Outline")); rcvr = interpreterProxy->stackValue(1); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(2, _return_value); return null; } errorCode = 0; @@ -1266,8 +1308,7 @@ contours[i] = (gs->outline.contours[i]); } if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(1); return null; @@ -1281,13 +1322,21 @@ FT_GlyphSlot gs; FT_Face face; sqInt aFace; + sqInt _return_value; + + /* ptr to struct */ + interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face")); aFace = interpreterProxy->stackValue(0); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Outline")); rcvr = interpreterProxy->stackValue(1); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(2, _return_value); return null; } errorCode = 0; @@ -1308,9 +1357,9 @@ ; interpreterProxy->storeIntegerofObjectwithValue(FT2OutlineContoursSizeIndex, rcvr, gs->outline.n_contours); interpreterProxy->storeIntegerofObjectwithValue(FT2OutlinePointsSizeIndex, rcvr, gs->outline.n_points); + interpreterProxy->storeIntegerofObjectwithValue(FT2OutlineFlagsIndex, rcvr, gs->outline.flags); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(1); return null; @@ -1324,8 +1373,7 @@ _return_value = interpreterProxy->positive32BitIntegerFor((FT_ERROR_MODULE(errorCode))); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->popthenPush(1, _return_value); return null; @@ -1342,6 +1390,7 @@ FT_Face face; char *fontFilePath; sqInt anInteger; + sqInt _return_value; interpreterProxy->success(interpreterProxy->isBytes(interpreterProxy->stackValue(1))); fontFilePath = ((char *) (interpreterProxy->firstIndexableField(interpreterProxy->stackValue(1)))); @@ -1349,7 +1398,11 @@ interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(2), "FT2Face")); rcvr = interpreterProxy->stackValue(2); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(3, _return_value); return null; } ; @@ -1373,8 +1426,7 @@ } ftAllocateHandleInReceiverForPointer(face); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(2); return null; @@ -1391,6 +1443,7 @@ sqInt aFreeTypeExternalMemory; sqInt byteSize; sqInt anInteger; + sqInt _return_value; aFreeTypeExternalMemory = interpreterProxy->stackValue(2); byteSize = interpreterProxy->stackIntegerValue(1); @@ -1398,7 +1451,11 @@ interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(3), "FT2Face")); rcvr = interpreterProxy->stackValue(3); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(4, _return_value); return null; } ; @@ -1417,8 +1474,7 @@ } ftAllocateHandleInReceiverForPointer(face); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(3); return null; @@ -1435,10 +1491,17 @@ FT_Face face; sqInt _return_value; + + /* ptr to struct */ + interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2GlyphSlot")); rcvr = interpreterProxy->stackValue(0); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(1, _return_value); return null; } errorCode = 0; @@ -1461,8 +1524,7 @@ contoursSize = gs->outline.n_contours; _return_value = ((contoursSize << 1) | 1); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->popthenPush(1, _return_value); return null; @@ -1476,13 +1538,21 @@ sqInt faceOop; FT_Face face; sqInt formOop; + sqInt _return_value; + + /* temp struct */ + interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "Form")); formOop = interpreterProxy->stackValue(0); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face")); faceOop = interpreterProxy->stackValue(1); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(2, _return_value); return null; } face = ftHandleValueFromReceiver(faceOop); @@ -1497,8 +1567,7 @@ errorCode = FT_Outline_Get_Bitmap(library, &face->glyph->outline, &bitmap); interpreterProxy->success(errorCode == 0); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(1); return null; @@ -1513,14 +1582,22 @@ FT_Face face; sqInt formOop; sqInt mode; + sqInt _return_value; + + /* temp struct */ + interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "Form")); formOop = interpreterProxy->stackValue(1); mode = interpreterProxy->stackIntegerValue(0); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(2), "FT2Face")); faceOop = interpreterProxy->stackValue(2); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(3, _return_value); return null; } face = ftHandleValueFromReceiver(faceOop); @@ -1535,8 +1612,7 @@ errorCode = FT_Outline_Get_Bitmap(library, &face->glyph->outline, &bitmap); interpreterProxy->success(errorCode == 0); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(2); return null; @@ -1550,8 +1626,7 @@ errorCode = 0; _return_value = interpreterProxy->positive32BitIntegerFor(oldError); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->popthenPush(1, _return_value); return null; @@ -1562,12 +1637,17 @@ sqInt rcvr; FT_Face face; sqInt encodingString; + sqInt _return_value; encodingString = interpreterProxy->stackValue(0); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face")); rcvr = interpreterProxy->stackValue(1); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(2, _return_value); return null; } face = ftHandleValueFromReceiver(rcvr); @@ -1586,8 +1666,7 @@ return null; } if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(1); return null; @@ -1598,13 +1677,18 @@ FT_Face face; sqInt x; sqInt y; + sqInt _return_value; x = interpreterProxy->stackIntegerValue(1); y = interpreterProxy->stackIntegerValue(0); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(2), "FT2Face")); rcvr = interpreterProxy->stackValue(2); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(3, _return_value); return null; } face = ftHandleValueFromReceiver(rcvr); @@ -1618,8 +1702,7 @@ return null; } if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(2); return null; @@ -1634,13 +1717,18 @@ sqInt rcvr; sqInt matrixWordArray; sqInt deltaWordArray; + sqInt _return_value; matrixWordArray = interpreterProxy->stackValue(1); deltaWordArray = interpreterProxy->stackValue(0); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(2), "FT2Face")); rcvr = interpreterProxy->stackValue(2); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(3, _return_value); return null; } face = ftHandleValueFromReceiver(rcvr); @@ -1657,8 +1745,7 @@ FT_Set_Transform( face, &matrix, &delta); } if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(2); return null; @@ -1670,12 +1757,17 @@ sqInt *matrixsqIntPtr; FT_Face face; sqInt matrixWordArray; + sqInt _return_value; matrixWordArray = interpreterProxy->stackValue(0); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face")); rcvr = interpreterProxy->stackValue(1); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(2, _return_value); return null; } face = ftHandleValueFromReceiver(rcvr); @@ -1690,8 +1782,7 @@ FT_Outline_Transform( &face->glyph->outline, &matrix ); } if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(1); return null; @@ -1703,12 +1794,17 @@ sqInt *deltasqIntPtr; FT_Face face; sqInt deltaWordArray; + sqInt _return_value; deltaWordArray = interpreterProxy->stackValue(0); interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face")); rcvr = interpreterProxy->stackValue(1); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(2, _return_value); return null; } face = ftHandleValueFromReceiver(rcvr); @@ -1722,8 +1818,7 @@ FT_Outline_Translate( &face->glyph->outline, delta.x, delta.y ); } if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } interpreterProxy->pop(1); return null; @@ -1734,11 +1829,16 @@ int apatch; sqInt rcvr; int amajor; + sqInt _return_value; interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Version")); rcvr = interpreterProxy->stackValue(0); if (interpreterProxy->failed()) { - ftParameterError(); + _return_value = ftParameterError(); + if (interpreterProxy->failed()) { + return ftParameterError(); + } + interpreterProxy->popthenPush(1, _return_value); return null; } errorCode = 0; @@ -1750,8 +1850,7 @@ ; interpreterProxy->storeIntegerofObjectwithValue(2, rcvr, apatch); if (interpreterProxy->failed()) { - ftParameterError(); - return null; + return ftParameterError(); } return null; } @@ -1819,7 +1918,6 @@ {"FT2Plugin", "primitiveErrorCode", (void*)primitiveErrorCode}, {"FT2Plugin", "initialiseModule", (void*)initialiseModule}, @@ Diff output truncated at 50000 characters. @@

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2014