Vm-dev November 2016

vm-dev@lists.squeakfoundation.org

34 participants
155 discussions

Start a nNew thread

[OpenSmalltalk/opensmalltalk-vm]
by GitHub 14 Nov '16

14 Nov '16

Branch: refs/heads/LLP64_v3 Home: https://github.com/OpenSmalltalk/opensmalltalk-vm

1 0

[OpenSmalltalk/opensmalltalk-vm] 481257: Regenerate source from VMMaker.oscog-nice.1981
by GitHub 14 Nov '16

14 Nov '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 4812579a48edf4637687db7590e312da8d2e23e8 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/4812579a48edf46376… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-12 (Sat, 12 Nov 2016) Changed paths: M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogitIA32.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/plugins/GdbARMPlugin/GdbARMPlugin.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/vm/cogitIA32.c M src/vm/cointerp.c M src/vm/cointerpmt.c M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- Regenerate source from VMMaker.oscog-nice.1981 This is just before the massive long->sqIntptr_t change for LLP64 compatibility. This includes following VMMaker changes: Improve portability to LLP64 by using usqInt rather than unsigned long where it makes sense. It's not the case of integer containing target machine pointer that should use usqIntptr_t for the eventual future case when image wordSize differs from machine word size (32bits image on 64bits VM). Currently, on Spur, LLP64 apart, usqInt and 'unsigned long' do match, and longAt: longAtPointer: in fact do return a sqInt (see platforms/cross/vm/sqMemory.h). So for now: - a single sista counter should fit into a usqInt. - an immediate character fits into a usqInt. - maxOldSpaceSize is not going to exeeed addressable space in the image, so it should allways fit into a usqInt too. Also fix primitiveFFIIntegerAt and merge LLP64 fixes Introduce sqIntptr_t and usqIntptr_t in VMMaker (image side) for LLP64 compatibility - but do not yet use them. These are integers long enough to hold a target machine pointer (BytesPerWord). These should later replace most usage of #long and #'unsigned long'. They are already defined in sqMemoryAccess.h. Add enough machinery for generating and simulating these types, inferring size, converting signedness etc.... Introduce asUnsignedIntegerPtr which will convert to (cast to) a usqIntptr_t. same for asIntegerPtr -> sqIntptr_t. They should replace most usage of asUnsignedLong and asLong in the future. Unless we don't want a machine word, but an oop, in which case we should use asUnsignedInteger (-> usqInt) or asInteger (-> sqInt) (typically to turn a longAt: into an unsignedLongAt: - because longAt: answers a sqInt not a long!) Restore the size of sqInt/usqInt as BytePerOop. BytesPerOop matches BytesPerWord for Spur currently, but the CCodeGenerator should be Spur-agnostic if possible. Move sqInt/usqInt check ahead in simulated sizeof: because most variables are of this type. Fix shifting in ffiCreateIntegralResultOop:ofAtomicType:in: like already applied in primitiveFFIIntegerAt/Put Properly count the parameters passed by register for X64 Win64: there are only 4 of them, either floating point or integer or any mix, but not 4 floating point and 4 integers. Fix passing structure by value in X64 Win64: size must be a power of 2, and it's not possible to pass a 16bytes structure into two registers. reportMinimumUnusedHeadroom with %lld format. That's superfluous in 32 bits, but does not hurt, and it works correctly in LLP64 contrarily to %ld. The alternative of using PRIdSQPTR macro would be overkill here. Review usage of long/unsigned long type hints that should better be replaced with sqInt/usqInt because the intention is to handle a oop, not a target machine address. Same with senders of asUnsignedLong, some should be replaced with asUnsignedInteger (that is a cast to usqInt), typically after longAt: because longAt: returns an oop (a sqInt). Let #'sqIntptr_t' #'usqIntptr_t' types be "isFunctional" to allow inlining in C code generator. Commit: 8ef57979bce002e446db9b2156a473f812ae65f3 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8ef57979bce002e446… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-12 (Sat, 12 Nov 2016) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspur64src/vm/vmCallback.h M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspursrc/vm/vmCallback.h M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstack64src/vm/vmCallback.h M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M nsspurstacksrc/vm/vmCallback.h M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spur64src/vm/vmCallback.h M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursista64src/vm/vmCallback.h M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursistasrc/vm/vmCallback.h M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spursrc/vm/vmCallback.h M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstack64src/vm/vmCallback.h M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M spurstacksrc/vm/vmCallback.h M src/plugins/AioPlugin/AioPlugin.c M src/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/BochsIA32Plugin/BochsIA32Plugin.c M src/plugins/BochsX64Plugin/BochsX64Plugin.c M src/plugins/FileCopyPlugin/FileCopyPlugin.c M src/plugins/FilePlugin/FilePlugin.c M src/plugins/GdbARMPlugin/GdbARMPlugin.c M src/plugins/HostWindowPlugin/HostWindowPlugin.c M src/plugins/IA32ABI/IA32ABI.c M src/plugins/InternetConfigPlugin/InternetConfigPlugin.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/MIDIPlugin/MIDIPlugin.c M src/plugins/MacMenubarPlugin/MacMenubarPlugin.c M src/plugins/Mpeg3Plugin/Mpeg3Plugin.c M src/plugins/QuicktimePlugin/QuicktimePlugin.c M src/plugins/SerialPlugin/SerialPlugin.c M src/plugins/SocketPlugin/SocketPlugin.c M src/plugins/SoundPlugin/SoundPlugin.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/SqueakFFIPrims.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c M src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c M src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c M src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M src/vm/vmCallback.h M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c M stacksrc/vm/vmCallback.h Log Message: ----------- Generate source from VMMaker.oscog-nice.1982 Replace remaining long/unsigned long with sqIntptr_t/usqIntptr_t. Replace asLong/asUnsignedLong senders with asIntegerPtr/asUnsignedIntegerPtr. This should be essentially for those int containing a target machine pointer/address. For some printf cCode (used for debugging), the %ld does not work in LLP64. We use the standard C way for compatible 32 & 64bits code: use PRI_format_Type macros as the format (mainly PRIxSQPTR). This way, VMMaker is now LLP64 friendly. For other conventions (ILP32 and LP64), this does not change anything since sqIntptr_t is equivalent to long. Commit: 80a7b63b3d1dbc516ecc494ed91ca28cb2430a51 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/80a7b63b3d1dbc516e… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c Log Message: ----------- Generate sources as per VMMaker.oscog-nice.1984 X64 Win64 FFI requires setsp/getsp It also uses PLATFORM_API_USES_CALLEE_POPS_CONVENTION Minor correction to VMMaker.oscog-nice.1977 to note that Sista counters are always 32-bits, having two 16-bit halves for the reached and taken counts. Commit: 34edc54c2111e729da5b5b3cc01d955166e0384d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/34edc54c2111e729da… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerpmt.c M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- Generate source as per VMMaker.oscog-nice.1985 Fix generation of signed32BitIntegerFor: for 64 bits VM. signed32BitIntegerFor: must work for any 32bit int, but current version will overflow if this int is large, for example -16r80000000. Indeed, not only constants must be extended to sqInt, but any expression whose type is shorter. Also, use unsigned usqInt, rather than signed sqInt, because it's well defined behavior (sign extension will occur during the conversion). Commit: de6f1fe556439da658ef627bd2b2173737e305a9 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/de6f1fe556439da658… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- Generate code as per VMMaker.oscog-nice.1986 Like already the case for the #positive32BitIntegerFor: and #signed32BitIntegerFor: , #positive32BitValueOf: and #signed32BitValueOf: can be simplified with separate 32/64 bits branches. Indeed, we know that any 32bits signed/unsigned int will fit into a SmallInteger when hasSixtyFourBitImmediates,. No need to perform any superfluous testing... The previous implementation produces a lot of dead code in 64bits VM and preve Commit: b6e47d7186694f60dc4cf711cd98e8ab08a71779 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b6e47d7186694f60dc… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M nsspur64src/vm/cointerp.c M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cointerp.c M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cointerp.c M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cointerp.c M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/MIDIPlugin/MIDIPlugin.c M src/plugins/SerialPlugin/SerialPlugin.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/vm/cointerp.c M src/vm/cointerpmt.c M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- Generate source as per VMMaker.oscog-nice.1989 Fix two forgotten C Compiler warnings about taking abs value of an unsigned integer. Of course, we want to take absolute value of signed difference. Fix inlining problem of shortPrintContext: - a side effect was eliminated on stack flavour. Fix prototype of unlockSurfaceFn after recent platforms source file revision. Also, the surfceID returned by primitiveCreateManualSurface is an int, so fits in signed32BitIntegerFor:. Avoid passing a sqInt to Serial and Midi external functions when they expect a pointer. Explicit a few conversions 64->32 bits to avoid compiler warnings in LargeIntegers. Fix prototype of various SurfaceFn again to match those of platforms/Corss/plugins/SurfacePlugin/SurfacePlugin.h These should be matching the prototypes: fn_getSurfaceFormat fn_lockSurface fn_unlockSurface fn_showSurface Commit: 3094f17943b8be16802710b775f8ccc326569a3b https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3094f17943b8be1680… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M build.win64x64/squeak.stack.spur/plugins.ext Log Message: ----------- Restore compiling of SqueakFFIPrims in win64x64 Commit: 867c0a966a138e3afc6f20aeff0147fc4d920094 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/867c0a966a138e3afc… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M nsspur64src/vm/cogitX64.c M spur64src/vm/cogitX64.c M spursista64src/vm/cogitX64.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c Log Message: ----------- Generate source as per VMMaker.oscog-nice.1990 Fix passing 64bits args thru LLP64 FFI. Also publish files forgotten from previous code generation (fix for SQABS(unsigned)) For now, changes are manually reviewed, header stamp is ignored, and minor (random) sqInt/usqInt changes too. Commit: 49a8b162b26e136c280f876ece4005090303a39c https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/49a8b162b26e136c28… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c Log Message: ----------- Generate Win32OSProcessPlugin source code as per VMConstruction-Plugins-OSProcessPlugin.oscog-nice.55 Fix for 64bits Win32OSProcessPlugin. handleArrayOopPtr is a pointer to a Smalltalk array, so the elements are OOP (sqInt), not unsigned int. Each element is ByteObject with correct size to store a HANDLE (sizeof(void *)), but at this level we don't care, that's the business of handleFrom:. Commit: 2ce043efc15950612a424ee796d73953dc444928 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2ce043efc15950612a… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M platforms/Cross/plugins/IA32ABI/x64win64ia32abicc.c Log Message: ----------- Fix intVal and sizeField macros for Win64 Alien (LLP64) Commit: b6c01efc52898c5e491e1805625e636d78b346da https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b6c01efc52898c5e49… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-14 (Mon, 14 Nov 2016) Changed paths: M build.win64x64/squeak.stack.spur/plugins.ext M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspur64src/vm/vmCallback.h M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspursrc/vm/vmCallback.h M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstack64src/vm/vmCallback.h M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M nsspurstacksrc/vm/vmCallback.h M platforms/Cross/plugins/IA32ABI/x64win64ia32abicc.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spur64src/vm/vmCallback.h M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursista64src/vm/vmCallback.h M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursistasrc/vm/vmCallback.h M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spursrc/vm/vmCallback.h M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstack64src/vm/vmCallback.h M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M spurstacksrc/vm/vmCallback.h M src/plugins/AioPlugin/AioPlugin.c M src/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/BochsIA32Plugin/BochsIA32Plugin.c M src/plugins/BochsX64Plugin/BochsX64Plugin.c M src/plugins/FileCopyPlugin/FileCopyPlugin.c M src/plugins/FilePlugin/FilePlugin.c M src/plugins/GdbARMPlugin/GdbARMPlugin.c M src/plugins/HostWindowPlugin/HostWindowPlugin.c M src/plugins/IA32ABI/IA32ABI.c M src/plugins/InternetConfigPlugin/InternetConfigPlugin.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/MIDIPlugin/MIDIPlugin.c M src/plugins/MacMenubarPlugin/MacMenubarPlugin.c M src/plugins/Mpeg3Plugin/Mpeg3Plugin.c M src/plugins/QuicktimePlugin/QuicktimePlugin.c M src/plugins/SerialPlugin/SerialPlugin.c M src/plugins/SocketPlugin/SocketPlugin.c M src/plugins/SoundPlugin/SoundPlugin.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/SqueakFFIPrims.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c M src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c M src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c M src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M src/vm/vmCallback.h M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c M stacksrc/vm/vmCallback.h Log Message: ----------- Merge pull request #95 from OpenSmalltalk/LLP64_v3 Llp64 v3 Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/3453ebe4a374...b6…

1 0

DirectX superseded by mingw provided files?
by Hernán Morales Durand 14 Nov '16

14 Nov '16

I have the latest update of MinGW with all libraries and tools installed. Which "provided files" superseded the DirectX headers in the VM? With help from Esteban I am trying to compile the Windows VM from this repo: https://github.com/estebanlm/opensmalltalk-vm branch "merge-with-pharo-win32” In \opensmalltalk-vm\build.win32x86\common\Makefile the include directive does NOT include the DirectX definitions on purpose: ############################################################################# # DirectX definitions - NOT USED - superseded by mingw provided files # DXDIR:= $(PLATDIR)/win32/third-party/dx9sdk/Include INCLUDES:= -I. -I$(VMSRCDIR) -I$(WIN32DIR) -I$(CROSSDIR) $(XINC) Compiling with MSYS opensmalltalk-vm/build.win32x86/pharo.cog.spur/mvm -f Causes compilation to fail finding dinput.h ../../platforms/win32/vm/sqWin32DirectInput.c:37:20: dinput.h: No such file or directory ... make: *** [build/vm/sqWin32DirectInput.o] Error 1 Now I added the DXDIR include to "fix" the issue: INCLUDES:= -I. -I$(VMSRCDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) Cheers, Hernán

3 3

Newly built VM not finding its display plugin :-(
by Hans-Martin Mosner 14 Nov '16

14 Nov '16

Hi, I'm in the process of creating a simple and reproducible automated VM build environment using Docker. My current docker image basically seems to work, however, I've not been able to run the created executable yet. I've naively assumed that the shell script "squeak" in directory .../products/sqcogspur64linux would do the right thing, but it complains that it could not find the display driver: "could not find display driver vm-display-X11". The direcory structure in "products" differs a bit from the release VM directory structure, but it looks like it is supposed to work anyway. I've done an strace of the process, and it finds and opens the plugin just fine (twice, actually), but just before writing the error message it seems to want to open it again under various different names, just not the right one... Here are the relevant strace lines of the first two plugin maps: stat("sqcogspur64linux/lib/squeak/5.0-/vm-display-X11", {st_mode=S_IFREG|0755, st_size=373136, ...}) = 0 open("sqcogspur64linux/lib/squeak/5.0-/vm-display-X11", O_RDONLY|O_CLOEXEC) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0 j\0\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=373136, ...}) = 0 getcwd("/tmp/products", 128) = 14 mmap(NULL, 2212928, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f3938d0d000 mprotect(0x7f3938d26000, 2097152, PROT_NONE) = 0 mmap(0x7f3938f26000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x19000) = 0x7f3938f26000 mmap(0x7f3938f28000, 5184, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f3938f28000 close(3) = 0 stat("/tmp/products/sqcogspur64linux/lib/squeak/5.0-/vm-display-X11", {st_mode=S_IFREG|0755, st_size=373136, ...}) = 0 open("/tmp/products/sqcogspur64linux/lib/squeak/5.0-/vm-display-X11", O_RDONLY|O_CLOEXEC) = 3 read(3, "\177ELF\2\1\1\0\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0 j\0\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=373136, ...}) = 0 mmap(NULL, 2212928, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f3938d0d000 mprotect(0x7f3938d26000, 2097152, PROT_NONE) = 0 mmap(0x7f3938f26000, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x19000) = 0x7f3938f26000 mmap(0x7f3938f28000, 5184, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f3938f28000 close(3) = 0 But the last attempt fails: stat("/tmp/products/sqcogspur64linux/lib/squeak/5.0-/vm-display-X11.so", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/tmp/products/sqcogspur64linux/lib/squeak/5.0-/vm-display-X11.dylib", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/tmp/products/sqcogspur64linux/lib/squeak/5.0-/libvm-display-X11", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/tmp/products/sqcogspur64linux/lib/squeak/5.0-/libvm-display-X11.so", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/tmp/products/sqcogspur64linux/lib/squeak/5.0-/libvm-display-X11.dylib", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/lib/x86_64-linux-gnu/vm-display-X11", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/lib/x86_64-linux-gnu/vm-display-X11.so", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/lib/x86_64-linux-gnu/vm-display-X11.dylib", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/lib/x86_64-linux-gnu/libvm-display-X11", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/lib/x86_64-linux-gnu/libvm-display-X11.so", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/lib/x86_64-linux-gnu/libvm-display-X11.dylib", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/lib/vm-display-X11", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/lib/vm-display-X11.so", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/lib/vm-display-X11.dylib", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/lib/libvm-display-X11", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/lib/libvm-display-X11.so", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/lib/libvm-display-X11.dylib", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/lib/x86_64-linux-gnu/vm-display-X11", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/lib/x86_64-linux-gnu/vm-display-X11.so", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/lib/x86_64-linux-gnu/vm-display-X11.dylib", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/lib/x86_64-linux-gnu/libvm-display-X11", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/lib/x86_64-linux-gnu/libvm-display-X11.so", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/lib/x86_64-linux-gnu/libvm-display-X11.dylib", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/lib/vm-display-X11", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/lib/vm-display-X11.so", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/lib/vm-display-X11.dylib", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/lib/libvm-display-X11", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/lib/libvm-display-X11.so", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/lib/libvm-display-X11.dylib", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/home/hmm/Squeak/images/vm-display-X11", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/home/hmm/Squeak/images/vm-display-X11.so", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/home/hmm/Squeak/images/vm-display-X11.dylib", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/home/hmm/Squeak/images/libvm-display-X11", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/home/hmm/Squeak/images/libvm-display-X11.so", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/home/hmm/Squeak/images/libvm-display-X11.dylib", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/local/lib/vm-display-X11", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/local/lib/vm-display-X11.so", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/local/lib/vm-display-X11.dylib", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/local/lib/libvm-display-X11", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/local/lib/libvm-display-X11.so", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("/usr/local/lib/libvm-display-X11.dylib", 0x7ffd9d228780) = -1 ENOENT (No such file or directory) stat("vm-display-X11", 0x7ffd9d22a7a0) = -1 ENOENT (No such file or directory) stat("vm-display-X11.so", 0x7ffd9d22a7a0) = -1 ENOENT (No such file or directory) stat("vm-display-X11.dylib", 0x7ffd9d22a7a0) = -1 ENOENT (No such file or directory) stat("libvm-display-X11", 0x7ffd9d22a7a0) = -1 ENOENT (No such file or directory) stat("libvm-display-X11.so", 0x7ffd9d22a7a0) = -1 ENOENT (No such file or directory) stat("libvm-display-X11.dylib", 0x7ffd9d22a7a0) = -1 ENOENT (No such file or directory) stat("/vm-display-X11", 0x7ffd9d22a7a0) = -1 ENOENT (No such file or directory) stat("/vm-display-X11.so", 0x7ffd9d22a7a0) = -1 ENOENT (No such file or directory) stat("/vm-display-X11.dylib", 0x7ffd9d22a7a0) = -1 ENOENT (No such file or directory) stat("/libvm-display-X11", 0x7ffd9d22a7a0) = -1 ENOENT (No such file or directory) stat("/libvm-display-X11.so", 0x7ffd9d22a7a0) = -1 ENOENT (No such file or directory) stat("/libvm-display-X11.dylib", 0x7ffd9d22a7a0) = -1 ENOENT (No such file or directory) stat("/tmp/products/sqcogspur64linux/lib/squeak/5.0-/vm-display-X11/.libs/vm-display-X11", 0x7ffd9d22a790) = -1 ENOTDIR (Not a directory) stat("/tmp/products/sqcogspur64linux/lib/squeak/5.0-/vm-display-X11/.libs/vm-display-X11.so", 0x7ffd9d22a790) = -1 ENOTDIR (Not a directory) stat("/tmp/products/sqcogspur64linux/lib/squeak/5.0-/vm-display-X11/.libs/vm-display-X11.dylib", 0x7ffd9d22a790) = -1 ENOTDIR (Not a directory) stat("/tmp/products/sqcogspur64linux/lib/squeak/5.0-/vm-display-X11/.libs/libvm-display-X11", 0x7ffd9d22a790) = -1 ENOTDIR (Not a directory) stat("/tmp/products/sqcogspur64linux/lib/squeak/5.0-/vm-display-X11/.libs/libvm-display-X11.so", 0x7ffd9d22a790) = -1 ENOTDIR (Not a directory) stat("/tmp/products/sqcogspur64linux/lib/squeak/5.0-/vm-display-X11/.libs/libvm-display-X11.dylib", 0x7ffd9d22a790) = -1 ENOTDIR (Not a directory) write(2, "could not find display driver vm"..., 54could not find display driver vm-display-X11; either: ) = 54 write(2, " - check that /tmp/products/sqc"..., 92 - check that /tmp/products/sqcogspur64linux/lib/squeak/5.0-//vm-display-X11.so exists, or ) = 92 write(2, " - use the '-plugins <path>' op"..., 64 - use the '-plugins <path>' option to tell me where it is, or ) = 64 write(2, " - remove DISPLAY from your env"..., 42 - remove DISPLAY from your environment. ) = 42 Any idea what I might be missing? Cheers, Hans-Martin

2 1

[OpenSmalltalk/opensmalltalk-vm] 3453eb: Hide passing tests from stdout [ci skip]
by GitHub 13 Nov '16

13 Nov '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 3453ebe4a374a21b0e9a058d353b45437c540bf7 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3453ebe4a374a21b0e… Author: Fabio Niephaus <code(a)fniephaus.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M tests/smalltalk.ston Log Message: ----------- Hide passing tests from stdout [ci skip]

1 0

[OpenSmalltalk/opensmalltalk-vm] 49a8b1: Generate Win32OSProcessPlugin source code as per V...
by GitHub 13 Nov '16

13 Nov '16

Branch: refs/heads/LLP64_v3 Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 49a8b162b26e136c280f876ece4005090303a39c https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/49a8b162b26e136c28… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c Log Message: ----------- Generate Win32OSProcessPlugin source code as per VMConstruction-Plugins-OSProcessPlugin.oscog-nice.55 Fix for 64bits Win32OSProcessPlugin. handleArrayOopPtr is a pointer to a Smalltalk array, so the elements are OOP (sqInt), not unsigned int. Each element is ByteObject with correct size to store a HANDLE (sizeof(void *)), but at this level we don't care, that's the business of handleFrom:. Commit: 2ce043efc15950612a424ee796d73953dc444928 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2ce043efc15950612a… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M platforms/Cross/plugins/IA32ABI/x64win64ia32abicc.c Log Message: ----------- Fix intVal and sizeField macros for Win64 Alien (LLP64) Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/867c0a966a13...2c…

1 0

[OpenSmalltalk/opensmalltalk-vm] b6e47d: Generate source as per VMMaker.oscog-nice.1989
by GitHub 13 Nov '16

13 Nov '16

Branch: refs/heads/LLP64_v3 Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: b6e47d7186694f60dc4cf711cd98e8ab08a71779 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b6e47d7186694f60dc… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M nsspur64src/vm/cointerp.c M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cointerp.c M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cointerp.c M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cointerp.c M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/MIDIPlugin/MIDIPlugin.c M src/plugins/SerialPlugin/SerialPlugin.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/vm/cointerp.c M src/vm/cointerpmt.c M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- Generate source as per VMMaker.oscog-nice.1989 Fix two forgotten C Compiler warnings about taking abs value of an unsigned integer. Of course, we want to take absolute value of signed difference. Fix inlining problem of shortPrintContext: - a side effect was eliminated on stack flavour. Fix prototype of unlockSurfaceFn after recent platforms source file revision. Also, the surfceID returned by primitiveCreateManualSurface is an int, so fits in signed32BitIntegerFor:. Avoid passing a sqInt to Serial and Midi external functions when they expect a pointer. Explicit a few conversions 64->32 bits to avoid compiler warnings in LargeIntegers. Fix prototype of various SurfaceFn again to match those of platforms/Corss/plugins/SurfacePlugin/SurfacePlugin.h These should be matching the prototypes: fn_getSurfaceFormat fn_lockSurface fn_unlockSurface fn_showSurface Commit: 3094f17943b8be16802710b775f8ccc326569a3b https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3094f17943b8be1680… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M build.win64x64/squeak.stack.spur/plugins.ext Log Message: ----------- Restore compiling of SqueakFFIPrims in win64x64 Commit: 867c0a966a138e3afc6f20aeff0147fc4d920094 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/867c0a966a138e3afc… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M nsspur64src/vm/cogitX64.c M spur64src/vm/cogitX64.c M spursista64src/vm/cogitX64.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c Log Message: ----------- Generate source as per VMMaker.oscog-nice.1990 Fix passing 64bits args thru LLP64 FFI. Also publish files forgotten from previous code generation (fix for SQABS(unsigned)) For now, changes are manually reviewed, header stamp is ignored, and minor (random) sqInt/usqInt changes too. Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/de6f1fe55643...86…

1 0

VM Maker: VMMaker.oscog-nice.1990.mcz
by commits＠source.squeak.org 13 Nov '16

13 Nov '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1990.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1990 Author: nice Time: 13 November 2016, 4:43:50.332281 pm UUID: c6fc0dfe-e6b3-4eff-bd4c-ed591f81125e Ancestors: VMMaker.oscog-nice.1989 Fix passing 64bits args thru LLP64 FFI. =============== Diff against VMMaker.oscog-nice.1989 =============== Item was changed: ----- Method: ThreadedARMFFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <var: #calloutState type: #'CalloutState *'> <var: #loadFloatRegs declareC: 'extern void loadFloatRegs(double, double, double, double, double, double, double, double)'> "Go out, call this guy and create the return value. This *must* be inlined because of the alloca of the outgoing stack frame in ffiCall:WithFlags:NumArgs:Args:AndTypes:" | myThreadIndex atomicType floatRet intRet loadFloatRegs oop | <var: #floatRet type: #double> <var: #intRet type: #usqLong> <inline: true> self cCode: '' inSmalltalk: [loadFloatRegs := #used. loadFloatRegs class]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [myThreadIndex := interpreterProxy disownVM: 0]]. self registerArgsSlop + self cStackAlignment > 0 ifTrue: [self setsp: calloutState argVector]. calloutState floatRegisterIndex > 0 ifTrue: [self load: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 0)) to: 'double *') at: 0) Flo: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 2)) to: 'double *') at: 0) a: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 4)) to: 'double *') at: 0) t: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 6)) to: 'double *') at: 0) R: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 8)) to: 'double *') at: 0) e: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 10)) to: 'double *') at: 0) g: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 12)) to: 'double *') at: 0) s: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 14)) to: 'double *') at: 0)]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. (atomicType >> 1) = (FFITypeSingleFloat >> 1) ifTrue: [atomicType = FFITypeSingleFloat ifTrue: [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)] ifFalse: "atomicType = FFITypeDoubleFloat" [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)]] ifFalse: [intRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqIntptr_t (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqLong (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)]. "undo any callee argument pops because it may confuse stack management with the alloca." (self isCalleePopsConvention: calloutState callFlags) ifTrue: [self setsp: calloutState argVector]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [interpreterProxy ownVM: myThreadIndex]]. (calloutState ffiRetHeader anyMask: FFIFlagPointer+FFIFlagStructure) ifTrue: ["Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct." (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: [oop := self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState] ifFalse: [oop := self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^oop]. (atomicType >> 1) = (FFITypeSingleFloat >> 1) ifTrue: [oop := interpreterProxy floatObjectOf: floatRet] ifFalse: [oop := self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState]. ^interpreterProxy methodReturnValue: oop! Item was changed: ----- Method: ThreadedX64SysVFFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <var: #calloutState type: #'CalloutState *'> <var: #loadFloatRegs declareC: 'extern void loadFloatRegs(double, double, double, double, double, double, double, double)'> "Go out, call this guy and create the return value. This *must* be inlined because of the alloca of the outgoing stack frame in ffiCall:WithFlags:NumArgs:Args:AndTypes:" | myThreadIndex atomicType floatRet intRet loadFloatRegs oop | <var: #floatRet type: #double> <var: #intRet type: 'SixteenByteReturn'> <inline: true> self cCode: '' inSmalltalk: [loadFloatRegs := #used. loadFloatRegs class]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [myThreadIndex := interpreterProxy disownVM: 0]]. self registerArgsSlop + self cStackAlignment > 0 ifTrue: [self setsp: calloutState argVector]. calloutState floatRegisterIndex > 0 ifTrue: [self load: (calloutState floatRegisters at: 0) Flo: (calloutState floatRegisters at: 1) a: (calloutState floatRegisters at: 2) t: (calloutState floatRegisters at: 3) R: (calloutState floatRegisters at: 4) e: (calloutState floatRegisters at: 5) g: (calloutState floatRegisters at: 6) s: (calloutState floatRegisters at: 7)]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. (atomicType >> 1) = (FFITypeSingleFloat >> 1) ifTrue: [atomicType = FFITypeSingleFloat ifTrue: [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(long, long, long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)] ifFalse: "atomicType = FFITypeDoubleFloat" [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(long, long, long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)]] ifFalse: [intRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'SixteenByteReturn (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'SixteenByteReturn (*)(long, long, long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)]. "undo any callee argument pops because it may confuse stack management with the alloca." (self isCalleePopsConvention: calloutState callFlags) ifTrue: [self setsp: calloutState argVector]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [interpreterProxy ownVM: myThreadIndex]]. (calloutState ffiRetHeader anyMask: FFIFlagPointer+FFIFlagStructure) ifTrue: ["Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct." (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: [oop := self ffiReturnPointer: intRet a ofType: (self ffiReturnType: specOnStack) in: calloutState] ifFalse: [oop := self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^oop]. (atomicType >> 1) = (FFITypeSingleFloat >> 1) ifTrue: [oop := interpreterProxy floatObjectOf: floatRet] ifFalse: [oop := self ffiCreateIntegralResultOop: intRet a ofAtomicType: atomicType in: calloutState]. ^interpreterProxy methodReturnValue: oop! Item was changed: ----- Method: ThreadedX64Win64FFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <var: #calloutState type: #'CalloutState *'> <var: #loadFloatRegs declareC: 'extern void loadFloatRegs(double, double, double, double)'> "Go out, call this guy and create the return value. This *must* be inlined because of the alloca of the outgoing stack frame in ffiCall:WithFlags:NumArgs:Args:AndTypes:" | myThreadIndex atomicType floatRet intRet loadFloatRegs oop | <var: #floatRet type: #double> <var: #intRet type: #usqLong> <inline: true> self cCode: '' inSmalltalk: [loadFloatRegs := #used. loadFloatRegs class]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [myThreadIndex := interpreterProxy disownVM: 0]]. self registerArgsSlop + self cStackAlignment > 0 ifTrue: [self setsp: calloutState argVector]. calloutState floatRegisterSignature > 0 ifTrue: [self load: (calloutState floatRegisters at: 0) Flo: (calloutState floatRegisters at: 1) at: (calloutState floatRegisters at: 2) Re: (calloutState floatRegisters at: 3) gs: (calloutState floatRegisters at: 4)]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. (atomicType >> 1) = (FFITypeSingleFloat >> 1) ifTrue: [atomicType = FFITypeSingleFloat ifTrue: [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)] ifFalse: "atomicType = FFITypeDoubleFloat" [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)]] ifFalse: [intRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqIntptr_t (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqLong (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)]. "undo any callee argument pops because it may confuse stack management with the alloca." (self isCalleePopsConvention: calloutState callFlags) ifTrue: [self setsp: calloutState argVector]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [interpreterProxy ownVM: myThreadIndex]]. (calloutState ffiRetHeader anyMask: FFIFlagPointer+FFIFlagStructure) ifTrue: ["Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct." (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: [oop := self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState] ifFalse: [oop := self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^oop]. (atomicType >> 1) = (FFITypeSingleFloat >> 1) ifTrue: [oop := interpreterProxy floatObjectOf: floatRet] ifFalse: [oop := self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState]. ^interpreterProxy methodReturnValue: oop!

1 0

[OpenSmalltalk/opensmalltalk-vm] 481257: Regenerate source from VMMaker.oscog-nice.1981
by GitHub 13 Nov '16

13 Nov '16

Branch: refs/heads/LLP64_v3 Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 4812579a48edf4637687db7590e312da8d2e23e8 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/4812579a48edf46376… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-12 (Sat, 12 Nov 2016) Changed paths: M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogitIA32.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/plugins/GdbARMPlugin/GdbARMPlugin.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/vm/cogitIA32.c M src/vm/cointerp.c M src/vm/cointerpmt.c M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- Regenerate source from VMMaker.oscog-nice.1981 This is just before the massive long->sqIntptr_t change for LLP64 compatibility. This includes following VMMaker changes: Improve portability to LLP64 by using usqInt rather than unsigned long where it makes sense. It's not the case of integer containing target machine pointer that should use usqIntptr_t for the eventual future case when image wordSize differs from machine word size (32bits image on 64bits VM). Currently, on Spur, LLP64 apart, usqInt and 'unsigned long' do match, and longAt: longAtPointer: in fact do return a sqInt (see platforms/cross/vm/sqMemory.h). So for now: - a single sista counter should fit into a usqInt. - an immediate character fits into a usqInt. - maxOldSpaceSize is not going to exeeed addressable space in the image, so it should allways fit into a usqInt too. Also fix primitiveFFIIntegerAt and merge LLP64 fixes Introduce sqIntptr_t and usqIntptr_t in VMMaker (image side) for LLP64 compatibility - but do not yet use them. These are integers long enough to hold a target machine pointer (BytesPerWord). These should later replace most usage of #long and #'unsigned long'. They are already defined in sqMemoryAccess.h. Add enough machinery for generating and simulating these types, inferring size, converting signedness etc.... Introduce asUnsignedIntegerPtr which will convert to (cast to) a usqIntptr_t. same for asIntegerPtr -> sqIntptr_t. They should replace most usage of asUnsignedLong and asLong in the future. Unless we don't want a machine word, but an oop, in which case we should use asUnsignedInteger (-> usqInt) or asInteger (-> sqInt) (typically to turn a longAt: into an unsignedLongAt: - because longAt: answers a sqInt not a long!) Restore the size of sqInt/usqInt as BytePerOop. BytesPerOop matches BytesPerWord for Spur currently, but the CCodeGenerator should be Spur-agnostic if possible. Move sqInt/usqInt check ahead in simulated sizeof: because most variables are of this type. Fix shifting in ffiCreateIntegralResultOop:ofAtomicType:in: like already applied in primitiveFFIIntegerAt/Put Properly count the parameters passed by register for X64 Win64: there are only 4 of them, either floating point or integer or any mix, but not 4 floating point and 4 integers. Fix passing structure by value in X64 Win64: size must be a power of 2, and it's not possible to pass a 16bytes structure into two registers. reportMinimumUnusedHeadroom with %lld format. That's superfluous in 32 bits, but does not hurt, and it works correctly in LLP64 contrarily to %ld. The alternative of using PRIdSQPTR macro would be overkill here. Review usage of long/unsigned long type hints that should better be replaced with sqInt/usqInt because the intention is to handle a oop, not a target machine address. Same with senders of asUnsignedLong, some should be replaced with asUnsignedInteger (that is a cast to usqInt), typically after longAt: because longAt: returns an oop (a sqInt). Let #'sqIntptr_t' #'usqIntptr_t' types be "isFunctional" to allow inlining in C code generator. Commit: 8ef57979bce002e446db9b2156a473f812ae65f3 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8ef57979bce002e446… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-12 (Sat, 12 Nov 2016) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspur64src/vm/vmCallback.h M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspursrc/vm/vmCallback.h M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstack64src/vm/vmCallback.h M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M nsspurstacksrc/vm/vmCallback.h M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spur64src/vm/vmCallback.h M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursista64src/vm/vmCallback.h M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursistasrc/vm/vmCallback.h M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spursrc/vm/vmCallback.h M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstack64src/vm/vmCallback.h M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M spurstacksrc/vm/vmCallback.h M src/plugins/AioPlugin/AioPlugin.c M src/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/BochsIA32Plugin/BochsIA32Plugin.c M src/plugins/BochsX64Plugin/BochsX64Plugin.c M src/plugins/FileCopyPlugin/FileCopyPlugin.c M src/plugins/FilePlugin/FilePlugin.c M src/plugins/GdbARMPlugin/GdbARMPlugin.c M src/plugins/HostWindowPlugin/HostWindowPlugin.c M src/plugins/IA32ABI/IA32ABI.c M src/plugins/InternetConfigPlugin/InternetConfigPlugin.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/MIDIPlugin/MIDIPlugin.c M src/plugins/MacMenubarPlugin/MacMenubarPlugin.c M src/plugins/Mpeg3Plugin/Mpeg3Plugin.c M src/plugins/QuicktimePlugin/QuicktimePlugin.c M src/plugins/SerialPlugin/SerialPlugin.c M src/plugins/SocketPlugin/SocketPlugin.c M src/plugins/SoundPlugin/SoundPlugin.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/SqueakFFIPrims.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c M src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c M src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c M src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M src/vm/vmCallback.h M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c M stacksrc/vm/vmCallback.h Log Message: ----------- Generate source from VMMaker.oscog-nice.1982 Replace remaining long/unsigned long with sqIntptr_t/usqIntptr_t. Replace asLong/asUnsignedLong senders with asIntegerPtr/asUnsignedIntegerPtr. This should be essentially for those int containing a target machine pointer/address. For some printf cCode (used for debugging), the %ld does not work in LLP64. We use the standard C way for compatible 32 & 64bits code: use PRI_format_Type macros as the format (mainly PRIxSQPTR). This way, VMMaker is now LLP64 friendly. For other conventions (ILP32 and LP64), this does not change anything since sqIntptr_t is equivalent to long. Commit: 80a7b63b3d1dbc516ecc494ed91ca28cb2430a51 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/80a7b63b3d1dbc516e… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c Log Message: ----------- Generate sources as per VMMaker.oscog-nice.1984 X64 Win64 FFI requires setsp/getsp It also uses PLATFORM_API_USES_CALLEE_POPS_CONVENTION Minor correction to VMMaker.oscog-nice.1977 to note that Sista counters are always 32-bits, having two 16-bit halves for the reached and taken counts. Commit: 34edc54c2111e729da5b5b3cc01d955166e0384d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/34edc54c2111e729da… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerpmt.c M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- Generate source as per VMMaker.oscog-nice.1985 Fix generation of signed32BitIntegerFor: for 64 bits VM. signed32BitIntegerFor: must work for any 32bit int, but current version will overflow if this int is large, for example -16r80000000. Indeed, not only constants must be extended to sqInt, but any expression whose type is shorter. Also, use unsigned usqInt, rather than signed sqInt, because it's well defined behavior (sign extension will occur during the conversion). Commit: de6f1fe556439da658ef627bd2b2173737e305a9 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/de6f1fe556439da658… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-13 (Sun, 13 Nov 2016) Changed paths: M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- Generate code as per VMMaker.oscog-nice.1986 Like already the case for the #positive32BitIntegerFor: and #signed32BitIntegerFor: , #positive32BitValueOf: and #signed32BitValueOf: can be simplified with separate 32/64 bits branches. Indeed, we know that any 32bits signed/unsigned int will fit into a SmallInteger when hasSixtyFourBitImmediates,. No need to perform any superfluous testing... The previous implementation produces a lot of dead code in 64bits VM and preve Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/4812579a48ed^...d…

1 0

VM Maker: VMMaker.oscog-nice.1989.mcz
by commits＠source.squeak.org 13 Nov '16

13 Nov '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1989.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1989 Author: nice Time: 13 November 2016, 1:53:23.184058 pm UUID: 7e63fa13-3564-4b1b-8c0b-31378a87bc74 Ancestors: VMMaker.oscog-nice.1988 Fix prototype of various SurfaceFn again to match those of platforms/Corss/plugins/SurfacePlugin/SurfacePlugin.h These should be matching the prototypes: fn_getSurfaceFormat fn_lockSurface fn_unlockSurface fn_showSurface =============== Diff against VMMaker.oscog-nice.1988 =============== Item was changed: ----- Method: BitBltSimulation>>lockSurfaces (in category 'surface support') ----- lockSurfaces "Get a pointer to the bits of any OS surfaces." "Notes: * For equal source/dest handles only one locking operation is performed. This is to prevent locking of overlapping areas which does not work with certain APIs (as an example, DirectDraw prevents locking of overlapping areas). A special case for non-overlapping but equal source/dest handle would be possible but we would have to transfer this information over to unlockSurfaces somehow (currently, only one unlock operation is performed for equal source and dest handles). Also, this would require a change in the notion of ioLockSurface() which is right now interpreted as a hint and not as a requirement to lock only the specific portion of the surface. * The arguments in ioLockSurface() provide the implementation with an explicit hint what area is affected. It can be very useful to know the max. affected area beforehand if getting the bits requires expensive copy operations (e.g., like a roundtrip to the X server or a glReadPixel op). However, the returned pointer *MUST* point to the virtual origin of the surface and not to the beginning of the rectangle. The promise made by BitBlt is to never access data outside the given rectangle (aligned to 4byte boundaries!!) so it is okay to return a pointer to the virtual origin that is actually outside the valid memory area. * The area provided in ioLockSurface() is already clipped (e.g., it will always be inside the source and dest boundingBox) but it is not aligned to word boundaries yet. It is up to the support code to compute accurate alignment if necessary. * Warping always requires the entire source surface to be locked because there is no beforehand knowledge about what area will actually be traversed. " | sourceHandle destHandle l r t b fn | <inline: true> + <var: #fn declareC:'sqIntptr_t (*fn)(sqIntptr_t, int*, int, int, int, int)'> - <var: #fn declareC:'sqInt (*fn)(sqInt, sqInt*, sqInt, sqInt, sqInt, sqInt)'> hasSurfaceLock := false. destBits = 0 ifTrue:["Blitting *to* OS surface" lockSurfaceFn = 0 ifTrue:[self loadSurfacePlugin ifFalse:[^nil]]. + fn := self cCoerce: lockSurfaceFn to: 'sqIntptr_t (*)(sqIntptr_t, int*, int, int, int, int)'. - fn := self cCoerce: lockSurfaceFn to: 'sqInt (*)(sqInt, sqInt*, sqInt, sqInt, sqInt, sqInt)'. destHandle := interpreterProxy fetchInteger: FormBitsIndex ofObject: destForm. (sourceBits = 0 and:[noSource not]) ifTrue:[ sourceHandle := interpreterProxy fetchInteger: FormBitsIndex ofObject: sourceForm. "Handle the special case of equal source and dest handles" (sourceHandle = destHandle) ifTrue:[ "If we have overlapping source/dest we lock the entire area so that there is only one area transmitted" isWarping ifFalse:[ "When warping we always need the entire surface for the source" sourceBits := self cCode:'fn(sourceHandle, &sourcePitch, 0,0, sourceWidth, sourceHeight)'. ] ifTrue:[ "Otherwise use overlapping area" l := sx min: dx. r := (sx max: dx) + bbW. t := sy min: dy. b := (sy max: dy) + bbH. sourceBits := self cCode:'fn(sourceHandle, &sourcePitch, l, t, r-l, b-t)'. ]. destBits := sourceBits. destPitch := sourcePitch. hasSurfaceLock := true. ^destBits ~~ 0 ]. "Fall through - if not equal it'll be handled below" ]. destBits := self cCode:'fn(destHandle, &destPitch, dx, dy, bbW, bbH)'. hasSurfaceLock := true. ]. (sourceBits == 0 and:[noSource not]) ifTrue:["Blitting *from* OS surface" sourceHandle := interpreterProxy fetchInteger: FormBitsIndex ofObject: sourceForm. interpreterProxy failed ifTrue:[^nil]. "fetch sourceHandle could fail" lockSurfaceFn = 0 ifTrue:[self loadSurfacePlugin ifFalse:[^nil]]. + fn := self cCoerce: lockSurfaceFn to: 'sqIntptr_t (*)(sqIntptr_t, int*, int, int, int, int)'. - fn := self cCoerce: lockSurfaceFn to: 'sqInt (*)(sqInt, sqInt*, sqInt, sqInt, sqInt, sqInt)'. "Warping requiring the entire surface" isWarping ifTrue:[ sourceBits := self cCode:'fn(sourceHandle, &sourcePitch, 0, 0, sourceWidth, sourceHeight)'. ] ifFalse:[ sourceBits := self cCode:'fn(sourceHandle, &sourcePitch, sx, sy, bbW, bbH)'. ]. hasSurfaceLock := true. ]. ^destBits ~~ 0 and:[sourceBits ~~ 0 or:[noSource]].! Item was changed: ----- Method: BitBltSimulation>>queryDestSurface: (in category 'surface support') ----- queryDestSurface: handle "Query the dimension of an OS surface. This method is provided so that in case the inst vars of the source form are broken, *actual* values of the OS surface can be obtained. This might, for instance, happen if the user resizes the main window. Note: Moved to a separate function for better inlining of the caller." querySurfaceFn = 0 ifTrue:[self loadSurfacePlugin ifFalse:[^false]]. + ^(self cCode:' ((int (*) (sqIntptr_t, int*, int*, int*, int*))querySurfaceFn) - ^(self cCode:' ((sqInt (*) (sqInt, sqInt*, sqInt*, sqInt*, sqInt*))querySurfaceFn) (handle, &destWidth, &destHeight, &destDepth, &destMSB)' inSmalltalk:[false])! Item was changed: ----- Method: BitBltSimulation>>querySourceSurface: (in category 'surface support') ----- querySourceSurface: handle "Query the dimension of an OS surface. This method is provided so that in case the inst vars of the source form are broken, *actual* values of the OS surface can be obtained. This might, for instance, happen if the user resizes the main window. Note: Moved to a separate function for better inlining of the caller." querySurfaceFn = 0 ifTrue:[self loadSurfacePlugin ifFalse:[^false]]. + ^(self cCode:' ((int (*) (sqIntptr_t, int*, int*, int*, int*))querySurfaceFn) - ^(self cCode:' ((sqInt (*) (sqInt, sqInt*, sqInt*, sqInt*, sqInt*))querySurfaceFn) (handle, &sourceWidth, &sourceHeight, &sourceDepth, &sourceMSB)' inSmalltalk:[false])! Item was changed: ----- Method: BitBltSimulation>>unlockSurfaces (in category 'surface support') ----- unlockSurfaces "Unlock the bits of any OS surfaces." "See the comment in lockSurfaces. Similar rules apply. That is, the area provided in ioUnlockSurface can be used to determine the dirty region after drawing. If a source is unlocked, then the area will be (0,0,0,0) to indicate that no portion is dirty." | sourceHandle destHandle destLocked fn | + <var: #fn declareC:'int (*fn)(sqIntptr_t, int, int, int, int)'> - <var: #fn declareC:'int (*fn)(int, int, int, int, int)'> hasSurfaceLock ifTrue:[ unlockSurfaceFn = 0 ifTrue:[self loadSurfacePlugin ifFalse:[^nil]]. + fn := self cCoerce: unlockSurfaceFn to: 'int (*)(sqIntptr_t, int, int, int, int)'. - fn := self cCoerce: unlockSurfaceFn to: 'int (*)(int, int, int, int, int)'. destLocked := false. destHandle := interpreterProxy fetchPointer: FormBitsIndex ofObject: destForm. (interpreterProxy isIntegerObject: destHandle) ifTrue:[ destHandle := interpreterProxy integerValueOf: destHandle. "The destBits are always assumed to be dirty" self cCode:'fn(destHandle, affectedL, affectedT, affectedR-affectedL, affectedB-affectedT)'. destBits := destPitch := 0. destLocked := true. ]. noSource ifFalse:[ sourceHandle := interpreterProxy fetchPointer: FormBitsIndex ofObject: sourceForm. (interpreterProxy isIntegerObject: sourceHandle) ifTrue:[ sourceHandle := interpreterProxy integerValueOf: sourceHandle. "Only unlock sourceHandle if different from destHandle" (destLocked and:[sourceHandle = destHandle]) ifFalse:[self cCode: 'fn(sourceHandle, 0, 0, 0, 0)']. sourceBits := sourcePitch := 0. ]. ]. hasSurfaceLock := false. self cCode: [] inSmalltalk: [self touch: fn. interpreterProxy displayObject = destForm ifTrue: [interpreterProxy getDeferDisplayUpdates "for some reason this is true..." ifTrue: [interpreterProxy fullDisplayUpdate] ifFalse: [interpreterProxy fullDisplayUpdate]]]. ].! Item was changed: ----- Method: Interpreter>>displayBitsOf:Left:Top:Right:Bottom: (in category 'I/O primitives') ----- displayBitsOf: aForm Left: l Top: t Right: r Bottom: b "Repaint the portion of the Smalltalk screen bounded by the affected rectangle. Used to synchronize the screen after a Bitblt to the Smalltalk Display object." | displayObj dispBits w h dispBitsIndex d left right top bottom surfaceHandle | displayObj := self splObj: TheDisplay. aForm = displayObj ifFalse: [^ nil]. self success: ((self isPointers: displayObj) and: [(self lengthOf: displayObj) >= 4]). successFlag ifTrue: [ dispBits := self fetchPointer: 0 ofObject: displayObj. w := self fetchInteger: 1 ofObject: displayObj. h := self fetchInteger: 2 ofObject: displayObj. d := self fetchInteger: 3 ofObject: displayObj. ]. l < 0 ifTrue:[left := 0] ifFalse: [left := l]. r > w ifTrue: [right := w] ifFalse: [right := r]. t < 0 ifTrue: [top := 0] ifFalse: [top := t]. b > h ifTrue: [bottom := h] ifFalse: [bottom := b]. ((left <= right) and: [top <= bottom]) ifFalse: [^nil]. successFlag ifTrue: [ (self isIntegerObject: dispBits) ifTrue: [ surfaceHandle := self integerValueOf: dispBits. showSurfaceFn = 0 ifTrue: [ showSurfaceFn := self ioLoadFunction: 'ioShowSurface' From: 'SurfacePlugin'. showSurfaceFn = 0 ifTrue: [^self success: false]]. + self cCode:'((int (*)(sqIntptr_t, int, int, int, int))showSurfaceFn)(surfaceHandle, left, top, right-left, bottom-top)'. - self cCode:'((sqInt (*)(sqInt, sqInt, sqInt, sqInt, sqInt))showSurfaceFn)(surfaceHandle, left, top, right-left, bottom-top)'. ] ifFalse: [ dispBitsIndex := dispBits + self baseHeaderSize. "index in memory byte array" self cCode: 'ioShowDisplay(dispBitsIndex, w, h, d, left, right, top, bottom)' inSmalltalk: [self showDisplayBits: dispBitsIndex w: w h: h d: d left: left right: right top: top bottom: bottom] ]. ].! Item was changed: ----- Method: StackInterpreter>>displayBitsOf:Left:Top:Right:Bottom: (in category 'I/O primitives') ----- displayBitsOf: aForm Left: l Top: t Right: r Bottom: b "Repaint the portion of the Smalltalk screen bounded by the affected rectangle. Used to synchronize the screen after a Bitblt to the Smalltalk Display object." | displayObj dispBits w h dispBitsIndex d left right top bottom surfaceHandle | displayObj := objectMemory splObj: TheDisplay. aForm = displayObj ifFalse: [^ nil]. self success: ((objectMemory isPointers: displayObj) and: [(objectMemory lengthOf: displayObj) >= 4]). self successful ifTrue: [ dispBits := objectMemory fetchPointer: 0 ofObject: displayObj. w := self fetchInteger: 1 ofObject: displayObj. h := self fetchInteger: 2 ofObject: displayObj. d := self fetchInteger: 3 ofObject: displayObj. ]. l < 0 ifTrue:[left := 0] ifFalse: [left := l]. r > w ifTrue: [right := w] ifFalse: [right := r]. t < 0 ifTrue: [top := 0] ifFalse: [top := t]. b > h ifTrue: [bottom := h] ifFalse: [bottom := b]. ((left <= right) and: [top <= bottom]) ifFalse: [^nil]. self successful ifTrue: [ (objectMemory isIntegerObject: dispBits) ifTrue: [ surfaceHandle := objectMemory integerValueOf: dispBits. showSurfaceFn = 0 ifTrue: [ showSurfaceFn := self ioLoadFunction: 'ioShowSurface' From: 'SurfacePlugin'. showSurfaceFn = 0 ifTrue: [^self success: false]]. + self cCode:'((int (*)(sqIntptr_t, int, int, int, int))showSurfaceFn)(surfaceHandle, left, top, right-left, bottom-top)'. - self cCode:'((sqInt (*)(sqInt, sqInt, sqInt, sqInt, sqInt))showSurfaceFn)(surfaceHandle, left, top, right-left, bottom-top)'. ] ifFalse: [ self assert: (objectMemory isNonImmediate: dispBits). dispBitsIndex := dispBits + objectMemory baseHeaderSize. "index in memory byte array" self cCode: 'ioShowDisplay(dispBitsIndex, w, h, d, left, right, top, bottom)' inSmalltalk: [self showDisplayBits: dispBitsIndex w: w h: h d: d left: left right: right top: top bottom: bottom] ]. ]!

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2016