Vm-dev

vm-dev@lists.squeakfoundation.org

10 participants
17027 discussions

VM Maker: VMMaker.oscog-eem.3377.mcz
by commits＠source.squeak.org 17 May '24

17 May '24

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3377.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3377 Author: eem Time: 16 May 2024, 6:31:18.147712 pm UUID: c6eda587-c1ed-48ee-b583-b9ede8904c03 Ancestors: VMMaker.oscog-eem.3376 Filter out unused variables from clusteredVariableNames (which is for access to interpreter variables from the cogit). Fix a speeling rorre. =============== Diff against VMMaker.oscog-eem.3376 =============== Item was removed: - ----- Method: CoInterpreterMT class>>clusteredVariableNames (in category 'translation') ----- - clusteredVariableNames - "Insist that these variables are present early in the list of variables, and in this order, - so that e.g. they are conveniently accessed via the VarBaseReg if it is available." - ^#(vmOwner), super clusteredVariableNames "reject: [:n| self allInstVarNames includes: n]"! Item was changed: ----- Method: SimpleStackBasedCogit>>genFastPrimTraceUsing:and: (in category 'primitive generators') ----- genFastPrimTraceUsing: r1 and: r2 + "Support for compileInterpreterPrimitive. Generate inline code - "Suport for compileInterpreterPrimitive. Generate inline code so as to record the primitive trace as fast as possible." backEnd byteReadsZeroExtend ifFalse: [self MoveCq: 0 R: r2]. self MoveAb: coInterpreter primTraceLogIndexAddress R: r2. self LoadEffectiveAddressMw: 1 r: r2 R: r1. self MoveR: r1 Ab: coInterpreter primTraceLogIndexAddress. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: r1)). self MoveMw: (self offset: CogMethod of: #methodObject) r: r1 R: TempReg. self MoveCw: coInterpreter primTraceLogAddress asInteger R: r1. self MoveR: TempReg Xwr: r2 R: r1! Item was changed: ----- Method: VMMaker>>maybeGenerateVariableOrderFiles: (in category 'generate sources') ----- maybeGenerateVariableOrderFiles: cg | order | (self interpreterClass respondsTo: #clusteredVariableNames) ifFalse: [^self]. "First find the longest order. These files can contain false positives. So e.g. it's preferrable to generate the list for CoInterpreterMT instead of two lists, one each for CoInterpreterMT and CoInterpreter." order := self interpreterClass allSubclasses inject: self interpreterClass clusteredVariableNames into: [:o :sc| sc clusteredVariableNames size > o size ifTrue: [sc clusteredVariableNames] ifFalse: [o]]. + order := order select: [:name| cg hasVariable: name]. "now generate versions for the different symbol formats in use." #('variable_order' '_variable_order') with: #(nil $_) do: [:file :prefix| | contents filePath | contents := String streamContents: [:s| order do: [:name| prefix ifNotNil: [s nextPut: prefix]. s nextPutAll: name; cr]]. filePath := self coreVMDirectory fullNameFor: file. (cg needToGenerateHeader: file file: filePath contents: contents) ifTrue: [(self class forceNewFileNamed: filePath) nextPutAll: contents; close]]!

1 0

[OpenSmalltalk/opensmalltalk-vm] 9912fe: Fix a warning in genUnixImageResource.c, and a mis...
by Eliot Miranda 17 May '24

17 May '24

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 9912fe228b9d19a349e54e656c40a1303156923d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/9912fe228b9d19a349… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2024-05-16 (Thu, 16 May 2024) Changed paths: M deploy/packaging/genUnixImageResource.c M platforms/iOS/vm/OSX/sqMacV2Browser.m Log Message: ----------- Fix a warning in genUnixImageResource.c, and a misspelled reserved word in sqMacV2Browser.m. To unsubscribe from these emails, change your notification settings at https://github.com/OpenSmalltalk/opensmalltalk-vm/settings/notifications

1 0

[OpenSmalltalk/opensmalltalk-vm] be7009: Support for embedding images in unix executables. ...
by Eliot Miranda 16 May '24

16 May '24

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: be70093900e23469c7d07f8970f1d92670ef4084 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/be70093900e23469c7… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2024-05-15 (Wed, 15 May 2024) Changed paths: A deploy/packaging/README.unix A deploy/packaging/genUnixImageResource.c M platforms/unix/vm/sqImageFileAccess.h M platforms/unix/vm/sqUnixMain.c Log Message: ----------- Support for embedding images in unix executables. See deploy/packaging/README.unix for instructions. To unsubscribe from these emails, change your notification settings at https://github.com/OpenSmalltalk/opensmalltalk-vm/settings/notifications

3 3

[OpenSmalltalk/opensmalltalk-vm] cc0821: CogVM source as per VMMaker.oscog-eem.3376
by Eliot Miranda 15 May '24

15 May '24

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: cc0821558f32ff5e89facdb6cfd6460bd082edaa https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/cc0821558f32ff5e89… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2024-05-14 (Tue, 14 May 2024) Changed paths: M src/plugins/ImmX11Plugin/ImmX11Plugin.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3376 Fix some compilation warnings in the ImmX11Plugin due to casting pointers to ints for testing, but do so by using a more modern API. To unsubscribe from these emails, change your notification settings at https://github.com/OpenSmalltalk/opensmalltalk-vm/settings/notifications

1 0

VM Maker: VMMaker.oscog-eem.3376.mcz
by commits＠source.squeak.org 15 May '24

15 May '24

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3376.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3376 Author: eem Time: 14 May 2024, 4:40:26.878767 pm UUID: faacafb6-e86f-47eb-a105-34e030dca3dd Ancestors: VMMaker.oscog-eem.3375 Fix some compilaiton warnings in the ImmX11Plugin due to casting pointers to ints for testing, but do so by using a more modern API. =============== Diff against VMMaker.oscog-eem.3375 =============== Item was changed: SmartSyntaxInterpreterPlugin subclass: #ImmX11Plugin + instanceVariableNames: 'sqTextEncoding localeEncoding uxPathEncoding uxTextEncoding uxXWinEncoding textEncodingUTF8' - instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-Plugins'! Item was added: + ----- Method: ImmX11Plugin class>>declareCVarsIn: (in category 'translation') ----- + declareCVarsIn: aCCodeGenerator + "Note: This method must be implemented by all subclasses to declare variables." + + self instVarNames do: "imported from e.g. platforms/unix/vm/sqUnixCharConv.h" + [:ivn| aCCodeGenerator removeVariable: ivn ifAbsent: nil]. + super declareCVarsIn: aCCodeGenerator! Item was changed: + ----- Method: ImmX11Plugin class>>declareHeaderFilesIn: (in category 'translation') ----- - ----- Method: ImmX11Plugin class>>declareHeaderFilesIn: (in category 'as yet unclassified') ----- declareHeaderFilesIn: cg cg addHeaderFile: '<locale.h>'. cg addHeaderFile: '"sqUnixMain.h"'. cg addHeaderFile: '"sqUnixCharConv.h"', Character cr asString, 'extern char *setLocale(char *, size_t);', Character cr asString, 'extern int setCompositionWindowPosition(int, int);', Character cr asString, 'extern int setCompositionFocus(int);'.! Item was changed: ----- Method: ImmX11Plugin>>primGetEncoding (in category 'primitives') ----- primGetEncoding - - | ret array len | - <export: true> + interpreterProxy methodReturnValue: (interpreterProxy stringForCString: sqTextEncoding) "i.e. answer empty string if sqTextEncoding is null"! - <var: #len type: 'int'> - <var: #array type: 'char *'> - len := self cCode: 'strlen(sqTextEncoding)'. - - ret := interpreterProxy - instantiateClass: interpreterProxy classString - indexableSize: len. - array := self cCoerce: (interpreterProxy firstIndexableField: ret) to: 'char *'. - self cCode: 'strncpy(array, (char *)sqTextEncoding, len)'. - - ^ ret.! Item was changed: ----- Method: ImmX11Plugin>>primGetLocale (in category 'primitives') ----- primGetLocale - - | ret array len locale | - <export: true> + self methodReturnStringOrNil: (self setlocale: #LC_CTYPE _: '')! - <var: #len type: 'int'> - <var: #array type: 'char *'> - <var: #locale type: 'char *'> - - locale := self cCode: 'setlocale(LC_CTYPE, "")'. - (self cCode: 'locale') - ifFalse: [ ret := interpreterProxy nilObject ] - ifTrue: [ - len := self cCode: 'strlen(locale)'. - ret := interpreterProxy - instantiateClass: interpreterProxy classString - indexableSize: len. - array := self cCoerce: (interpreterProxy firstIndexableField: ret) to: 'char *'. - self cCode: 'strncpy(array, (char *)locale, len)'. - ]. - ^ ret.! Item was changed: ----- Method: ImmX11Plugin>>primGetLocaleEncoding (in category 'primitives') ----- primGetLocaleEncoding - - | ret array len | - <export: true> + self methodReturnStringOrNil: localeEncoding! - <var: #len type: 'int'> - <var: #array type: 'char *'> - - (self cCode: '(int) localeEncoding') - ifFalse: [ ret := interpreterProxy nilObject ] - ifTrue: [ - len := self cCode: 'strlen(localeEncoding)'. - ret := interpreterProxy - instantiateClass: interpreterProxy classString - indexableSize: len. - array := self cCoerce: (interpreterProxy firstIndexableField: ret) to: 'char *'. - self cCode: 'strncpy(array, (char *)localeEncoding, len)'. - ]. - ^ ret.! Item was changed: ----- Method: ImmX11Plugin>>primGetPathEnc (in category 'primitives') ----- primGetPathEnc - - | ret array len | - <export: true> + interpreterProxy methodReturnValue: (interpreterProxy stringForCString: uxPathEncoding) "i.e. answer empty string if uxPathEncoding is null"! - <var: #len type: 'int'> - <var: #array type: 'char *'> - len := self cCode: 'strlen(uxPathEncoding)'. - - ret := interpreterProxy - instantiateClass: interpreterProxy classString - indexableSize: len. - array := self cCoerce: (interpreterProxy firstIndexableField: ret) to: 'char *'. - self cCode: 'strncpy(array, (char *)uxPathEncoding, len)'. - - ^ ret.! Item was changed: ----- Method: ImmX11Plugin>>primGetTextEnc (in category 'primitives') ----- primGetTextEnc - - | ret array len | - <export: true> + interpreterProxy methodReturnValue: (interpreterProxy stringForCString: uxTextEncoding) "i.e. answer empty string if uxTextEncoding is null"! - <var: #len type: 'int'> - <var: #array type: 'char *'> - len := self cCode: 'strlen(uxTextEncoding)'. - - ret := interpreterProxy - instantiateClass: interpreterProxy classString - indexableSize: len. - array := self cCoerce: (interpreterProxy firstIndexableField: ret) to: 'char *'. - self cCode: 'strncpy(array, (char *)uxTextEncoding, len)'. - - ^ ret.! Item was changed: ----- Method: ImmX11Plugin>>primGetXWinEnc (in category 'primitives') ----- primGetXWinEnc - - | ret array len | - <export: true> + interpreterProxy methodReturnValue: (interpreterProxy stringForCString: uxXWinEncoding) "i.e. answer empty string if uxXWinEncoding is null"! - <var: #len type: 'int'> - <var: #array type: 'char *'> - len := self cCode: 'strlen(uxXWinEncoding)'. - - ret := interpreterProxy - instantiateClass: interpreterProxy classString - indexableSize: len. - array := self cCoerce: (interpreterProxy firstIndexableField: ret) to: 'char *'. - self cCode: 'strncpy(array, (char *)uxXWinEncoding, len)'. - - ^ ret.! Item was changed: ----- Method: ImmX11Plugin>>primIsTextEncUTF8 (in category 'primitives') ----- primIsTextEncUTF8 <export: true> self primitive: 'primIsTextEncUTF8'. + ^textEncodingUTF8 asOop: Boolean.! - ^ (self cCode: 'textEncodingUTF8') asOop: Boolean.! Item was changed: ----- Method: ImmX11Plugin>>primSetEncoding: (in category 'primitives') ----- primSetEncoding: encoding - - | name len | <export: true> + self setNEncoding: (self addressOf: sqTextEncoding) + _: (interpreterProxy firstIndexableField: encoding) + _: (interpreterProxy stSizeOf: encoding). + ^encoding! - <var: #name type: 'char *'> - <var: #len type: 'size_t'> - len := interpreterProxy stSizeOf: encoding. - name := self cCoerce: (interpreterProxy firstIndexableField: encoding) to: 'char *'. - self cCode: 'setNEncoding(&sqTextEncoding, name, len)'. - ^ encoding. - ! Item was changed: ----- Method: ImmX11Plugin>>primSetEncodingToLocale (in category 'primitives') ----- primSetEncodingToLocale - - | ret | <export: true> self primitive: 'primSetEncodingToLocale'. + localeEncoding ifNotNil: + [sqTextEncoding := localeEncoding]. + ^localeEncoding notNil asOop: Boolean! - (self cCode: '(int) localeEncoding') - ifFalse: [ ret := interpreterProxy falseObject ] - ifTrue: [ - self cCode: 'sqTextEncoding = (void *)localeEncoding'. - ret := interpreterProxy trueObject - ]. - ^ ret! Item was changed: ----- Method: ImmX11Plugin>>primSetLocale: (in category 'primitives') ----- primSetLocale: locale - | name len ret array | <export: true> + self methodReturnStringOrNil: (self setLocale: (interpreterProxy firstIndexableField: locale) _: (interpreterProxy stSizeOf: locale))! - <var: #name type: 'char *'> - <var: #array type: 'char *'> - <var: #len type: 'size_t'> - len := interpreterProxy stSizeOf: locale. - name := self cCoerce: (interpreterProxy arrayValueOf: locale) to: 'char *'. - name := self cCode: 'setLocale(name, len)'. - (self cCode: '(int) name') - ifFalse: [^ interpreterProxy nilObject ] - ifTrue: [ - len := self cCode: 'strlen(name)'. - ret := interpreterProxy - instantiateClass: interpreterProxy classString - indexableSize: len. - array := self cCoerce: (interpreterProxy firstIndexableField: ret) to: 'char *'. - self cCode: 'strncpy(array, (char *)name, len)'. - ^ ret ]. - ! Item was changed: ----- Method: ImmX11Plugin>>primSetLocaleEncoding: (in category 'primitives') ----- primSetLocaleEncoding: encoding - - | name len | <export: true> + self setNEncoding: (self addressOf: localeEncoding) + _: (interpreterProxy firstIndexableField: encoding) + _: (interpreterProxy stSizeOf: encoding). + sqTextEncoding := uxTextEncoding := uxPathEncoding := uxXWinEncoding := localeEncoding. + ^encoding! - <var: #name type: 'char *'> - <var: #len type: 'size_t'> - len := interpreterProxy stSizeOf: encoding. - name := self cCoerce: (interpreterProxy firstIndexableField: encoding) to: 'char *'. - self cCode: 'setNEncoding(&localeEncoding, name, len)'. - self cCode: 'sqTextEncoding= uxTextEncoding= uxPathEncoding= uxXWinEncoding= localeEncoding'. - ^ encoding. - ! Item was changed: ----- Method: ImmX11Plugin>>primSetPathEnc: (in category 'primitives') ----- primSetPathEnc: encoding - - | name len | <export: true> + self setNEncoding: (self addressOf: uxPathEncoding) + _: (interpreterProxy firstIndexableField: encoding) + _: (interpreterProxy stSizeOf: encoding). + ^encoding! - <var: #name type: 'char *'> - <var: #len type: 'size_t'> - len := interpreterProxy stSizeOf: encoding. - name := self cCoerce: (interpreterProxy firstIndexableField: encoding) to: 'char *'. - self cCode: 'setNEncoding(&uxPathEncoding, name, len)'. - ^ encoding.! Item was changed: ----- Method: ImmX11Plugin>>primSetPathEncToLocale (in category 'primitives') ----- primSetPathEncToLocale - | ret | <export: true> self primitive: 'primSetPathEncToLocale'. + localeEncoding ifNotNil: + [uxPathEncoding := localeEncoding]. + ^localeEncoding notNil asOop: Boolean! - (self cCode: '(int) localeEncoding') - ifFalse: [ ret := interpreterProxy falseObject ] - ifTrue: [ - self cCode: 'uxPathEncoding = (void *)localeEncoding'. - ret := interpreterProxy trueObject - ]. - ^ ret! Item was changed: ----- Method: ImmX11Plugin>>primSetTextEnc: (in category 'primitives') ----- primSetTextEnc: encoding - - | name len | <export: true> + self setNEncoding: (self addressOf: uxTextEncoding) + _: (interpreterProxy firstIndexableField: encoding) + _: (interpreterProxy stSizeOf: encoding). + ^encoding! - <var: #name type: 'char *'> - <var: #len type: 'size_t'> - len := interpreterProxy stSizeOf: encoding. - name := self cCoerce: (interpreterProxy firstIndexableField: encoding) to: 'char *'. - self cCode: 'setNEncoding(&uxTextEncoding, name, len)'. - ^ encoding.! Item was changed: ----- Method: ImmX11Plugin>>primSetTextEncToLocale (in category 'primitives') ----- primSetTextEncToLocale - - | ret | <export: true> self primitive: 'primSetTextEncToLocale'. + localeEncoding ifNotNil: + [uxTextEncoding := localeEncoding]. + ^localeEncoding notNil asOop: Boolean! - (self cCode: '(int) localeEncoding') - ifFalse: [ ret := interpreterProxy falseObject ] - ifTrue: [ - self cCode: 'uxTextEncoding = (void *)localeEncoding'. - ret := interpreterProxy trueObject - ]. - ^ ret! Item was changed: ----- Method: ImmX11Plugin>>primSetTextEncUTF8: (in category 'primitives') ----- primSetTextEncUTF8: aBoolean <export: true> self primitive: 'primSetTextEncUTF8' parameters: #(Boolean). + textEncodingUTF8 := aBoolean. + ^ aBoolean asOop: Boolean! - self cCode: 'textEncodingUTF8 = aBoolean'. - ^ aBoolean asOop: Boolean.! Item was changed: ----- Method: ImmX11Plugin>>primSetXWinEnc: (in category 'primitives') ----- primSetXWinEnc: encoding - - | name len | <export: true> + self setNEncoding: (self addressOf: uxXWinEncoding) + _: (interpreterProxy firstIndexableField: encoding) + _: (interpreterProxy stSizeOf: encoding). + ^encoding! - <var: #name type: 'char *'> - <var: #len type: 'size_t'> - len := interpreterProxy stSizeOf: encoding. - name := self cCoerce: (interpreterProxy firstIndexableField: encoding) to: 'char *'. - self cCode: 'setNEncoding(&uxXWinEncoding, name, len)'. - ^ encoding.! Item was changed: ----- Method: ImmX11Plugin>>primSetXWinEncToLocale (in category 'primitives') ----- primSetXWinEncToLocale - - | ret | <export: true> self primitive: 'primSetXWinEncToLocale'. + localeEncoding ifNotNil: + [uxXWinEncoding := localeEncoding]. + ^localeEncoding notNil asOop: Boolean! - (self cCode: '(int) localeEncoding') - ifFalse: [ ret := interpreterProxy falseObject ] - ifTrue: [ - self cCode: 'uxXWinEncoding = (void *)localeEncoding'. - ret := interpreterProxy trueObject - ]. - ^ ret!

1 0

Question about building a VM
by Ignacio Truffat 13 May '24

13 May '24

Hi everybody, My name is Ignacio Truffat, I am currently working for my University's final project in Smalltalk. This language and the tool-set all look fantastic. Currently trying to grasp the process of building a VM. I am using 64b linux Mint. So far I have been able to: - Make the necessary configurations - Run *`scripts/updateSCCSVersions`* successfully - Install all libraries (or their equivalent, such as 'g++') as described in *`building/linux64x64/HowToBuild`* - Create a VMMaker image via the scripts in Platform - Use Squeak to run the VMMaker image - Use the VMMaker image to produce c-code (goes to the *`src`* folder) - Try to build the image using ` *building/linux64x64/squeak.cog.spurt/builds/mvm`* This last step is the one which is failing. For some reason, it seems the building step for plugin IA32ABI is failing. Here you have the excerpt: --------************************** gcc -Wall -g -O2 -DNDEBUG -DDEBUGVM=0 -msse2 -DCOGMTVM=0 -pthread -DLSB_FIRST=1 -m64 -Wno-missing-braces -Wno-unknown-pragmas -Wno-unused-value -Wno-unused-label -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -DHAVE_CONFIG_H -DSQUEAK_BUILTIN_PLUGIN -I/home/mint2/Desktop/tesis/repo/opensmalltalk-vm/building/linux64x64/squeak.cog.spur/build -I/home/mint2/Desktop/tesis/repo/opensmalltalk-vm/building/linux64x64/squeak.cog.spur/build -I/home/mint2/Desktop/tesis/repo/opensmalltalk-vm/platforms/unix/vm -I/home/mint2/Desktop/tesis/repo/opensmalltalk-vm/platforms/Cross/vm -I/home/mint2/Desktop/tesis/repo/opensmalltalk-vm/src/spur64.cog -I/usr/local/include -I/home/mint2/Desktop/tesis/repo/opensmalltalk-vm/platforms/Cross/plugins/IA32ABI -m64 -Wno-missing-braces -Wno-unknown-pragmas -Wno-unused-value -Wno-unused-label -Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -c -o xabicc.o /home/mint2/Desktop/tesis/repo/opensmalltalk-vm/platforms/Cross/plugins/IA32ABI/xabicc.c In file included from /home/mint2/Desktop/tesis/repo/opensmalltalk-vm/platforms/Cross/plugins/IA32ABI/xabicc.c:21: /home/mint2/Desktop/tesis/repo/opensmalltalk-vm/platforms/Cross/plugins/IA32ABI/x64sysvabicc.c:21:22: warning: missing terminating ' character 21 | # error Windows doesn't use the SystemV ABI | ^ In file included from /home/mint2/Desktop/tesis/repo/opensmalltalk-vm/platforms/Cross/plugins/IA32ABI/xabicc.c:21: /home/mint2/Desktop/tesis/repo/opensmalltalk-vm/platforms/Cross/plugins/IA32ABI/x64sysvabicc.c: In function ‘thunkEntry’: /home/mint2/Desktop/tesis/repo/opensmalltalk-vm/platforms/Cross/plugins/IA32ABI/x64sysvabicc.c:194:44: error: ‘DisownVMFromCallback’ undeclared (first use in this function) 194 | interpreterProxy->disownVM(DisownVMFromCallback); | ^~~~~~~~~~~~~~~~~~~~ /home/mint2/Desktop/tesis/repo/opensmalltalk-vm/platforms/Cross/plugins/IA32ABI/x64sysvabicc.c:194:44: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [Makefile:204: xabicc.o] Error 1 make: *** [Makefile:470: IA32ABI/IA32ABI.a] Error 2 --------************************** (will attach the whole log as an attachment in the email) Tried to see if I could simply remove the IA32ABI plugin, but the whole thing also breaks. Apparently it's being imported from other places, so maybe it's not something I should remove? Anyway, looking forward to your replies. Thank you for your time and attention. Cheers.

6 16

[OpenSmalltalk/opensmalltalk-vm] 15b25f: CogVM source as per VMMaker.oscog-eem.3375
by Eliot Miranda 13 May '24

13 May '24

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 15b25fa59fe21753da2e9c571fe9fbad919661c9 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/15b25fa59fe21753da… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2024-05-12 (Sun, 12 May 2024) Changed paths: M src/plugins/SocketPlugin/SocketPlugin.c M src/spur32.cog.lowcode/cogit.h M src/spur32.cog.lowcode/cogitARMv5.c M src/spur32.cog.lowcode/cogitIA32.c M src/spur32.cog.lowcode/cointerp.c M src/spur32.cog.lowcode/cointerp.h M src/spur32.cog.lowcode/gcc3x-cointerp.c M src/spur32.cog/cogit.h M src/spur32.cog/cogitARMv5.c M src/spur32.cog/cogitIA32.c M src/spur32.cog/cointerp.c M src/spur32.cog/cointerp.h M src/spur32.cog/cointerpmt.c M src/spur32.cog/cointerpmt.h M src/spur32.cog/gcc3x-cointerp.c M src/spur32.cog/gcc3x-cointerpmt.c M src/spur32.sista/cogit.h M src/spur32.sista/cogitARMv5.c M src/spur32.sista/cogitIA32.c M src/spur32.sista/cointerp.c M src/spur32.sista/cointerp.h M src/spur32.sista/gcc3x-cointerp.c M src/spur32.stack.lowcode/gcc3x-interp.c M src/spur32.stack.lowcode/interp.c M src/spur32.stack/gcc3x-interp.c M src/spur32.stack/interp.c M src/spur32.stack/validImage.c M src/spur64.cog.lowcode/cogit.h M src/spur64.cog.lowcode/cogitARMv8.c M src/spur64.cog.lowcode/cogitX64SysV.c M src/spur64.cog.lowcode/cogitX64WIN64.c M src/spur64.cog.lowcode/cointerp.c M src/spur64.cog.lowcode/cointerp.h M src/spur64.cog.lowcode/gcc3x-cointerp.c M src/spur64.cog/cogit.h M src/spur64.cog/cogitARMv8.c M src/spur64.cog/cogitX64SysV.c M src/spur64.cog/cogitX64WIN64.c M src/spur64.cog/cointerp.c M src/spur64.cog/cointerp.h M src/spur64.cog/cointerpmt.c M src/spur64.cog/cointerpmt.h M src/spur64.cog/gcc3x-cointerp.c M src/spur64.cog/gcc3x-cointerpmt.c M src/spur64.sista/cogit.h M src/spur64.sista/cogitARMv8.c M src/spur64.sista/cogitX64SysV.c M src/spur64.sista/cogitX64WIN64.c M src/spur64.sista/cointerp.c M src/spur64.sista/cointerp.h M src/spur64.sista/gcc3x-cointerp.c M src/spur64.stack.lowcode/gcc3x-interp.c M src/spur64.stack.lowcode/interp.c M src/spur64.stack/gcc3x-interp.c M src/spur64.stack/interp.c M src/spur64.stack/validImage.c M src/v3.cog/cogit.h M src/v3.cog/cogitARMv5.c M src/v3.cog/cogitIA32.c M src/v3.cog/cointerp.c M src/v3.cog/cointerp.h M src/v3.cog/gcc3x-cointerp.c M src/v3.stack/gcc3x-interp.c M src/v3.stack/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3375 Cleanups: fix all (clang) format warnings in the 64-bit cointerpreter and cogit. Rewrite SocketPlugin>>#intToNetAddress: to avoid asCharPtr. SocketPlugin Fix a few unchecked invocations of socketValueOf:. Simplify some methods to remove variables. To unsubscribe from these emails, change your notification settings at https://github.com/OpenSmalltalk/opensmalltalk-vm/settings/notifications

1 0

VM Maker: VMMaker.oscog-eem.3375.mcz
by commits＠source.squeak.org 13 May '24

13 May '24

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3375.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3375 Author: eem Time: 12 May 2024, 5:08:17.921052 pm UUID: f5ac2627-c6fa-4468-b11e-a67fde7fb22a Ancestors: VMMaker.oscog-eem.3374 Cleanups: fix all (clang) format warnings in the 64-bit cointerpreter and cogit. Add asCharPointer to help. Deprecate asCharPtr (the only example of an implicit firstIndexableField invocation; note asIntPtr is not even implemented). Rewrite SocketPlugin>>#intToNetAddress: to avoid asCharPtr. SocketPlugin Fix a few unchecked invocations of socketValueOf:. Simplify some methods to remove variables. Simulation: Make StackInterpreter>>#openImageFileNamed: expand ~ when a file name missing the .inage extension is given. =============== Diff against VMMaker.oscog-eem.3374 =============== Item was added: + ----- Method: CCodeGenerator>>generateAsCharPointer:on:indent: (in category 'C translation') ----- + generateAsCharPointer: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPutAll: '((char *)'. + self emitCExpression: msgNode receiver on: aStream. + aStream nextPut: $)! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation support') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #abs #generateAbs:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #>>> #generateSignedShiftRight:on:indent: #, #generateComma:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert #generateBitInvert:on:indent: #bitInvert32 #generateBitInvert:on:indent: #bitInvert64 #generateBitInvert:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #even #generateEven:on:indent: #odd #generateOdd:on:indent: #byteSwap32 #generateByteSwap32:on:indent: #byteSwap64 #generateByteSwap64:on:indent: #byteSwapped32IfBigEndian: generateByteSwap32IfBigEndian:on:indent: #byteSwapped64IfBigEndian: generateByteSwap64IfBigEndian:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #timesRepeat: #generateTimesRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue:cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cppIf:ifFalse: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: #asAddress:put: #generateAsAddress:on:indent: #signedIntFromLong64 #generateSignedIntFromLong64:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToLong64 #generateSignedIntToLong64:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asIntegerPtr #generateAsIntegerPtr:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asUnsignedIntegerPtr #generateAsUnsignedIntegerPtr:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asUnsignedLongLong #generateAsUnsignedLongLong:on:indent: + #asCharPointer #generateAsCharPointer:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #asWideString #generateAsWideString:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateAnyMask:on:indent: #allMask: #generateAllMask:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerOop #generateBytesPerOop:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #wordSize #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #minSmallInteger #generateSmallIntegerConstant:on:indent: #maxSmallInteger #generateSmallIntegerConstant:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #value:value:value: #generateValue:on:indent: #value:value:value:value: #generateValue:on:indent: #value:value:value:value:value: #generateValue:on:indent: #value:value:value:value:value:value: #generateValue:on:indent: #deny: #generateDeny:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: #strlen: #generateStrlen:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was changed: ----- Method: CoInterpreter>>printMethodCacheFor: (in category 'debug printing') ----- printMethodCacheFor: thing <public> "useful for VM debugging" | n | n := 0. 0 to: MethodCacheSize - 1 by: MethodCacheEntrySize do: [:i | | s c m p | s := methodCache at: i + MethodCacheSelector. c := methodCache at: i + MethodCacheClass. m := methodCache at: i + MethodCacheMethod. p := methodCache at: i + MethodCachePrimFunction. ((thing = -1 or: [s = thing or: [c = thing or: [p = thing or: [m = thing or: [(objectMemory addressCouldBeObj: m) and: [(self maybeMethodHasCogMethod: m) and: [(self cogMethodOf: m) asInteger = thing]]]]]]]) and: [(objectMemory addressCouldBeOop: s) and: [c ~= 0 and: [(self addressCouldBeClassObj: c) or: [self addressCouldBeClassObj: (objectMemory classForClassTag: c)]]]]) ifTrue: [n := n + 1. self cCode: nil inSmalltalk: [self transcript ensureCr]. '%ld %lx\n\t' f: transcript printf: { i. i }. (objectMemory isBytesNonImm: s) + ifTrue: ['%P %.*s\n' f: transcript printf: { s asVoidPointer. objectMemory numBytesOfBytes: s. (objectMemory firstIndexableField: s) asCharPointer }] - ifTrue: ['%P %.*s\n' f: transcript printf: { s asVoidPointer. objectMemory numBytesOfBytes: s. objectMemory firstIndexableField: s }] ifFalse: [self shortPrintOop: s]. self tab. (self addressCouldBeClassObj: c) ifTrue: [self shortPrintOop: c] ifFalse: [self printNum: c; space; printHexnp: c; space; shortPrintOop: (objectMemory classForClassTag: c)]. self tab; shortPrintOop: m; tab. self cCode: [p > 1024 ifTrue: [self printHexnp: p] ifFalse: [self printNum: p]] inSmalltalk: [p isSymbol ifTrue: [self print: p] ifFalse: [self printNum: p]]. self cr]]. n > 1 ifTrue: [self printNum: n; cr]! Item was changed: ----- Method: CoInterpreter>>printPrimLogEntryAt:hasParameter: (in category 'debug support') ----- printPrimLogEntryAt: i hasParameter: hasParameter <inline: false> "print the entry and answer if it takes a parameter (as the following entry)" | entryOop className length | entryOop := primTraceLog at: i. hasParameter ifTrue: [(objectMemory addressCouldBeObj: entryOop) ifTrue: [className := self nameOfClass: entryOop lengthInto: (self addressOf: length put: [:v| length := v])] ifFalse: [className := 'bad class'. length := 9]. '%.*s\n' f: transcript printf: { length. className }. ^false]. (objectMemory isImmediate: entryOop) ifTrue: [entryOop = TraceIncrementalGC ifTrue: [self print: '**IncrementalGC**\n'. ^false]. entryOop = TraceFullGC ifTrue: [self print: '**FullGC**\n'. ^false]. entryOop = TraceCodeCompaction ifTrue: [self print: '**CompactCode**\n'. ^false]. entryOop = TraceStackOverflow ifTrue: [self print: '**StackOverflow**\n'. ^false]. entryOop = TracePrimitiveFailure ifTrue: [self print: '**PrimitiveFailure** '. ^true]. entryOop = TracePrimitiveRetry ifTrue: [self print: '**PrimitiveRetry**\n'. ^false]. self print: '???\n'] ifFalse: [(objectMemory addressCouldBeObj: entryOop) ifFalse: ['%ld!!!!!!\n' f: transcript printf: i] ifTrue: [(objectMemory isCompiledMethod: entryOop) ifTrue: [| methodClass methodSel | className := '???'. length := 3. methodClass := self safeMethodClassOf: entryOop. methodClass ~= objectMemory nilObject ifTrue: [className := self nameOfClass: methodClass lengthInto: (self addressOf: length put: [:v| length := v])]. methodSel := self findSelectorOfMethod: entryOop. methodSel = objectMemory nilObject ifTrue: ['%.*s>>(selector not found)\n' f: transcript printf: { length. className }] ifFalse: ['%.*s>>#%.*s\n' f: transcript printf: { length. className. + objectMemory numBytesOfBytes: methodSel. (objectMemory firstIndexableField: methodSel) asCharPointer }]] - objectMemory numBytesOfBytes: methodSel. objectMemory firstIndexableField: methodSel }]] ifFalse: [objectMemory safePrintStringOf: entryOop. self cr]]]. ^false! Item was changed: ----- Method: Cogit>>printTrampolineTable (in category 'debugging') ----- printTrampolineTable <public> "useful for debugging" 0 to: trampolineTableIndex - 1 by: 2 do: + [:i| '%P: %s\n' f: coInterpreter getTranscript printf: { (trampolineAddresses at: i + 1) asVoidPointer. (trampolineAddresses at: i) asCharPointer }]! - [:i| - coInterpreter - printHex: (trampolineAddresses at: i + 1) asInteger; - print: ': '; - print: (self cCoerceSimple: (trampolineAddresses at: i) to: #'char *'); - cr]! Item was added: + ----- Method: Integer>>asCharPointer (in category '*VMMaker-interpreter simulator') ----- + asCharPointer + ^self! Item was changed: ----- Method: Integer>>asCharPtr (in category '*VMMaker-interpreter simulator') ----- asCharPtr + self deprecated. ^(Notification new tag: #getInterpreter; signal) ifNotNil: [:interpreter| (interpreter firstIndexableField: self) asInteger coerceTo: #'char *' sim: interpreter] ifNil: [self]! Item was changed: ----- Method: InterpreterPrimitives>>traceInputEvent: (in category 'I/O primitive support') ----- traceInputEvent: evtBuf <var: #evtBuf declareC: 'sqIntptr_t evtBuf[8]'> | eventTypeNames | eventTypeNames := self cCoerce: #('None' 'Mouse' 'Keyboard' 'DragDropFiles' 'Menu' 'Window' 'Complex' 'MouseWheel' 'Plugin') to: #'char **'. + 'Event%s/%ld @ %lu\t\t%ld/%lx %ld/%lx\n\t%ld/%lx %ld/%lx\t %ld/%lx %p\n' - 'Event%s/%ld @ %u\t\t%ld/%x %ld/%x\n\t%ld/%x %ld/%x\t %ld/%x %p\n' f: #stderr printf: { ((evtBuf at: 0) between: 0 and: 8) ifTrue: [eventTypeNames at: (evtBuf at: 0)] ifFalse: ['?']. evtBuf at: 0. evtBuf at: 1. "timestamp" evtBuf at: 2. evtBuf at: 2. evtBuf at: 3. evtBuf at: 3. evtBuf at: 4. evtBuf at: 4. evtBuf at: 5. evtBuf at: 5. evtBuf at: 6. evtBuf at: 6. (evtBuf at: 7) asVoidPointer } "windowIndex"! Item was changed: ----- Method: ObjectMemory>>printNonPointerDataOf:on: (in category 'debug printing interpreter support') ----- printNonPointerDataOf: oop on: aStream <var: 'aStream' type: #'FILE *'> | elementsPerLine format lastIndex | format := self formatOf: oop. self assert: (format between: self sixtyFourBitIndexableFormat and: self firstCompiledMethodFormat - 1). lastIndex := self lengthOf: oop format: format. lastIndex = 0 ifTrue: [^self]. format = self sixtyFourBitIndexableFormat ifTrue: [lastIndex := 32 min: lastIndex. elementsPerLine := 4. "0x/16r0123456789ABCDEF<space|cr> x 4 = 76/80" 1 to: lastIndex do: [:index| + '%19lX%c' f: aStream printf: { - '%19P%c' f: aStream printf: { self cCoerceSimple: (self fetchLong64: index - 1 ofObject: oop) to: #usqLong. (index \\ elementsPerLine = 0 or: [index = lastIndex]) ifTrue: [Character cr] ifFalse: [Character space] }]. ^self]. format < self firstByteFormat ifTrue: [lastIndex := 128 min: lastIndex. elementsPerLine := 6. "0x/16r12345678<space|cr> x 6 = 66/72" 1 to: lastIndex do: [:index| '%11P%c' f: aStream printf: { self fetchLong32: index - 1 ofObject: oop. (index \\ elementsPerLine = 0 or: [index = lastIndex]) ifTrue: [Character cr] ifFalse: [Character space] }]. ^self]. lastIndex := 256 min: lastIndex. elementsPerLine := 16. "0x/16r12<space|cr> x 16 = 80/96" 1 to: lastIndex do: [:index| '%5P%c' f: aStream printf: { self fetchByte: index - 1 ofObject: oop. (index \\ elementsPerLine = 0 or: [index = lastIndex]) ifTrue: [Character cr] ifFalse: [Character space] }]! Item was changed: ----- Method: ObjectMemory>>printStringDataOf:on: (in category 'debug printing interpreter support') ----- printStringDataOf: oop on: aStream <var: 'aStream' type: #'FILE *'> | i n limit | <var: 'buffer' type: #'char *'> <var: 'wideBuffer' type: #'unsigned int *'> (self isBytesNonImm: oop) ifTrue: [| buffer byte | + buffer := self cCoerce: (self alloca: 256 * 4) to: #'char *'. - buffer := self alloca: 256 * 4. n := i := 0. limit := (self numBytesOfBytes: oop) min: 256. + [n < limit] whileTrue: - [i < limit] whileTrue: [byte := self fetchByte: i ofObject: oop. i := i + 1. (byte < 32 "space" and: [byte ~= 9 "tab"]) ifTrue: [buffer at: n put: $<. n := n + 1. (byte = 10 or: [byte = 13]) ifTrue: [byte = 10 ifTrue: [buffer at: n put: $L; at: n + 1 put: $F] ifFalse: [buffer at: n put: $C; at: n + 1 put: $R]. n := n + 2] ifFalse: [byte >= 10 ifTrue: [buffer at: n put: byte // 10 + $0 asInteger. n := n + 1]. buffer at: n put: byte \\ 10 + $0 asInteger. n := n + 1]. buffer at: n put: $>. n := n + 1] ifFalse: [buffer at: n put: byte. n := n + 1]]. '%.*s%s\n' f: aStream printf: { n. buffer. (self numBytesOfBytes: oop) > limit ifTrue: ['...'] ifFalse: [''] }] ifFalse: [| wideBuffer word | self assert: (self isWordsNonImm: oop). + wideBuffer := self cCoerce: (self alloca: 1024 * 4) to: #'int *'. - wideBuffer := self cCoerce: (self alloca: 1024 * 4) to: 'int *'. n := i := 0. limit := (self lengthOf: oop) min: 256. [i < limit] whileTrue: [word := self fetchLong32: i ofObject: oop. i := i + 1. (word < 32 "space" and: [word ~= 9 "tab"]) ifTrue: [wideBuffer at: n put: $<. n := n + 1. (word = 10 or: [word = 13]) ifTrue: [word = 10 ifTrue: [wideBuffer at: n put: $L; at: n + 1 put: $F] ifFalse: [wideBuffer at: n put: $C; at: n + 1 put: $R]. n := n + 2] ifFalse: [word >= 10 ifTrue: [wideBuffer at: n put: word // 10 + $0 asInteger. n := n + 1]. wideBuffer at: n put: word \\ 10 + $0 asInteger. n := n + 1]. wideBuffer at: n put: $>. n := n + 1] ifFalse: [wideBuffer at: n put: word. n := n + 1]]. '%.*s%s\n' asWideString f: aStream wprintf: { n. wideBuffer. (self lengthOf: oop) > limit ifTrue: ['...'] ifFalse: [''] }]! Item was changed: ----- Method: SocketPlugin>>intToNetAddress: (in category 'primitives') ----- intToNetAddress: addr "Convert the given 32-bit integer into an internet network address represented as a four-byte ByteArray." | netAddressOop naPtr | + <var: #naPtr type: #'unsigned char * '> - <var: #naPtr type: 'char * '> + netAddressOop := interpreterProxy instantiateClass: interpreterProxy classByteArray indexableSize: 4. + naPtr := self cCoerce: (interpreterProxy firstIndexableField: netAddressOop) to: #'unsigned char *'. + naPtr at: 0 put: (addr >> 24 bitAnd: 16rFF). + naPtr at: 1 put: (addr >> 16 bitAnd: 16rFF). + naPtr at: 2 put: (addr >> 8 bitAnd: 16rFF). + naPtr at: 3 put: (addr bitAnd: 16rFF). + ^netAddressOop! - netAddressOop := - interpreterProxy instantiateClass: interpreterProxy classByteArray - indexableSize: 4. - naPtr := netAddressOop asCharPtr. - naPtr at: 0 put: (self cCoerce: ((addr >> 24) bitAnd: 16rFF) to: 'char'). - naPtr at: 1 put: (self cCoerce: ((addr >> 16) bitAnd: 16rFF) to: 'char'). - naPtr at: 2 put: (self cCoerce: ((addr >> 8) bitAnd: 16rFF) to: 'char'). - naPtr at: 3 put: (self cCoerce: (addr bitAnd: 16rFF) to: 'char'). - ^ netAddressOop! Item was changed: ----- Method: SocketPlugin>>primitiveResolverAddressLookupResult (in category 'primitives') ----- primitiveResolverAddressLookupResult | sz s | self primitive: 'primitiveResolverAddressLookupResult'. sz := self sqResolverAddrLookupResultSize. + interpreterProxy failed ifFalse: + [s := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: sz. + self sqResolverAddrLookup: (interpreterProxy firstIndexableField: s) asCharPointer Result: sz]. + ^s! - - interpreterProxy failed - ifFalse: [s := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: sz. - self sqResolverAddrLookup: s asCharPtr Result: sz]. - ^ s! Item was changed: ----- Method: SocketPlugin>>primitiveResolverLocalAddress (in category 'primitives') ----- primitiveResolverLocalAddress - | addr | self primitive: 'primitiveResolverLocalAddress'. + ^self intToNetAddress: self sqResolverLocalAddress! - addr := self sqResolverLocalAddress. - ^self intToNetAddress: addr! Item was changed: ----- Method: SocketPlugin>>primitiveResolverNameLookupResult (in category 'primitives') ----- primitiveResolverNameLookupResult - | addr | self primitive: 'primitiveResolverNameLookupResult'. + ^self intToNetAddress: self sqResolverNameLookupResult! - addr := self sqResolverNameLookupResult. - ^self intToNetAddress: addr! Item was changed: ----- Method: SocketPlugin>>primitiveSocketLocalAddress: (in category 'primitives') ----- primitiveSocketLocalAddress: socket + | s | + <var: #s type: #SocketPtr> - | s addr | - <var: #s type: 'SocketPtr'> self primitive: 'primitiveSocketLocalAddress' parameters: #(Oop). s := self socketValueOf: socket. + interpreterProxy failed ifFalse: + [^self intToNetAddress: (self sqSocketLocalAddress: s)]! - addr := self sqSocketLocalAddress: s. - ^self intToNetAddress: addr! Item was changed: ----- Method: SocketPlugin>>primitiveSocketRemoteAddress: (in category 'primitives') ----- primitiveSocketRemoteAddress: socket + | s | + <var: #s type: #SocketPtr> - | s addr | - <var: #s type: 'SocketPtr'> self primitive: 'primitiveSocketRemoteAddress' parameters: #(Oop). s := self socketValueOf: socket. + interpreterProxy failed ifFalse: + [^self intToNetAddress: (self sqSocketRemoteAddress: s)]! - addr := self sqSocketRemoteAddress: s. - ^self intToNetAddress: addr! Item was changed: ----- Method: SpurMemoryManager>>printBridge:on: (in category 'debug printing interpreter support') ----- printBridge: oop on: aStream <var: 'aStream' type: #'FILE *'> <inline: false> + '%P is a bridge hdr%d slot size %lu\n' - '%P is a bridge hdr%d slot size %ul\n' f: aStream printf: { oop asVoidPointer. (self hasOverflowHeader: oop) ifTrue: [16] ifFalse: [8]. self numSlotsOfAny: oop}! Item was changed: ----- Method: SpurMemoryManager>>printForwarder:on: (in category 'debug printing interpreter support') ----- printForwarder: oop on: aStream <var: 'aStream' type: #'FILE *'> <inline: false> + '%P is a forwarded hdr%d slot size %lu object to %P\n' - '%P is a forwarded hdr%d slot size %ul object to %P\n' f: aStream printf: { oop asVoidPointer. (self hasOverflowHeader: oop) ifTrue: [16] ifFalse: [8]. self numSlotsOfAny: oop. (self followForwarded: oop) asVoidPointer}! Item was changed: ----- Method: SpurMemoryManager>>printNonPointerDataOf:on: (in category 'debug printing interpreter support') ----- printNonPointerDataOf: oop on: aStream <var: 'aStream' type: #'FILE *'> | elementsPerLine format lastIndex | format := self formatOf: oop. self assert: (format between: self sixtyFourBitIndexableFormat and: self firstCompiledMethodFormat - 1). lastIndex := self lengthOf: oop format: format. lastIndex = 0 ifTrue: [^self]. format = self sixtyFourBitIndexableFormat ifTrue: [lastIndex := 32 min: lastIndex. elementsPerLine := 4. "0x/16r0123456789ABCDEF<space|cr> x 4 = 76/80" 1 to: lastIndex do: [:index| + '%19lX%c' f: aStream printf: { - '%19P%c' f: aStream printf: { self cCoerceSimple: (self fetchLong64: index - 1 ofObject: oop) to: #usqLong. (index \\ elementsPerLine = 0 or: [index = lastIndex]) ifTrue: [Character cr] ifFalse: [Character space] }]. ^self]. format < self firstShortFormat ifTrue: [lastIndex := 64 min: lastIndex. elementsPerLine := 8. "0x/16r12345678<space|cr> x 8 = 80/88" 1 to: lastIndex do: [:index| '%11P%c' f: aStream printf: { (self fetchLong32: index - 1 ofObject: oop) asVoidPointer. (index \\ elementsPerLine = 0 or: [index = lastIndex]) ifTrue: [Character cr] ifFalse: [Character space] }]. ^self]. format < self firstByteFormat ifTrue: [lastIndex := 128 min: lastIndex. elementsPerLine := 10. "0x/16r1234<space|cr> x 10 = 70/80" 1 to: lastIndex do: [:index| '%7P%c' f: aStream printf: { (self fetchShort16: index - 1 ofObject: oop) asVoidPointer. (index \\ elementsPerLine = 0 or: [index = lastIndex]) ifTrue: [Character cr] ifFalse: [Character space] }]. ^self]. lastIndex := 256 min: lastIndex. elementsPerLine := 16. "0x/16r12<space|cr> x 16 = 80/96" 1 to: lastIndex do: [:index| '%5P%c' f: aStream printf: { (self fetchByte: index - 1 ofObject: oop) asVoidPointer. (index \\ elementsPerLine = 0 or: [index = lastIndex]) ifTrue: [Character cr] ifFalse: [Character space] }]! Item was changed: ----- Method: StackInterpreter>>longPrintOop: (in category 'debug printing') ----- longPrintOop: oop <public> "useful for VM debugging" | fmt lastIndex startIP column cls | (objectMemory isImmediate: oop) ifTrue: [^objectMemory printImmediateObject: oop on: transcript]. (objectMemory addressCouldBeObj: oop) ifFalse: [^objectMemory printCantBeObject: oop on: transcript]. (objectMemory isFreeObject: oop) ifTrue: [^objectMemory printFreeObject: oop on: transcript]. (objectMemory isForwarded: oop) ifTrue: [^objectMemory printForwarder: oop on: transcript]. (cls := objectMemory fetchClassOfNonImm: oop) ifNil: ['%P has a nil class!!!!\n' f: transcript printf: oop asVoidPointer] ifNotNil: [| className length | className := self nameOfClass: cls lengthInto: (self addressOf: length put: [:v| length := v]). '%P: a(n) %.*s' f: transcript printf: {oop asVoidPointer. length. className }. objectMemory hasSpurMemoryManagerAPI ifTrue: ['(%lx=>%P)' f: transcript printf: { objectMemory compactClassIndexOf: oop. cls asVoidPointer }]]. fmt := objectMemory formatOf: oop. ' format %lx' f: transcript printf: fmt. fmt > objectMemory lastPointerFormat ifTrue: [' nbytes %ld' f: transcript printf: (objectMemory numBytesOf: oop)] ifFalse: [(objectMemory isIndexableFormat: fmt) ifTrue: [| len | len := objectMemory lengthOf: oop. ' size %ld' f: transcript printf: len - (objectMemory fixedFieldsOf: oop format: fmt length: len)]]. objectMemory printHeaderTypeOf: oop on: transcript. self print: ' hash '; printHex: (objectMemory rawHashBitsOf: oop). self cr. (fmt between: objectMemory firstLongFormat and: objectMemory firstCompiledMethodFormat - 1) ifTrue: ["This will answer false if splObj: ClassAlien is nilObject" (self is: oop KindOfClass: (objectMemory splObj: ClassAlien)) ifTrue: [^' datasize %ld %s @ %p\n' f: transcript printf: {objectMemory sizeFieldOfAlien: oop. (self isIndirectAlien: oop) ifTrue: ['indirect'] ifFalse: [(self isPointerAlien: oop) ifTrue: ['pointer'] ifFalse: ['direct']]. self startOfAlienData: oop }]. (self is: oop KindOfClass: (self superclassOf: (objectMemory splObj: ClassString))) ifTrue: [^objectMemory printStringDataOf: oop on: transcript]. ^objectMemory printNonPointerDataOf: oop on: transcript]. startIP := fmt >= objectMemory firstCompiledMethodFormat ifTrue: [(self startPCOfMethod: oop) / objectMemory wordSize] ifFalse: [objectMemory numSlotsOf: oop]. lastIndex := 256 min: startIP. lastIndex > 0 ifTrue: [1 to: lastIndex do: [:i| | fieldOop | fieldOop := objectMemory fetchPointer: i - 1 ofObject: oop. self space; printNum: i - 1; space; printHex: fieldOop; space. (i = 1 and: [objectMemory isCompiledMethod: oop]) ifTrue: [self printMethodHeaderOop: fieldOop] ifFalse: [self printOopShortInner: fieldOop]. self cr]]. (objectMemory isCompiledMethod: oop) ifFalse: [startIP > lastIndex ifTrue: [self print: '...'; cr]] ifTrue: [startIP := (self startPCOfMethod: oop) + 1. lastIndex := objectMemory lengthOf: oop. lastIndex - startIP > 256 ifTrue: [lastIndex := startIP + 256]. column := 1. startIP to: lastIndex do: [:index| | byte | column = 1 ifTrue: ['%11P ' f: transcript printf: (oop+BaseHeaderSize+index-1) asVoidPointer]. + byte := self cCoerceSimple: (objectMemory fetchByte: index - 1 ofObject: oop) to: #int. - byte := objectMemory fetchByte: index - 1 ofObject: oop. '%02x/%-3d%c' f: transcript printf: { byte. byte. column = 8 ifTrue: [Character cr] ifFalse: [Character space] }. (column := column + 1) > 8 ifTrue: [column := 1]]. (objectMemory lengthOf: oop) > lastIndex ifTrue: [self print: '...']. (column between: 2 and: 7) ifTrue: [self cr]]! Item was changed: ----- Method: StackInterpreter>>openImageFileNamed: (in category 'simulation support') ----- openImageFileNamed: fileName "Attempt to open fileName or fileName, '.image'" <doNotGenerate> | f | f := [FileStream readOnlyFileNamed: fileName] on: FileDoesNotExistException do: [:ex| ((fileName endsWith: '.image') not + and: [FileDirectory default fileExists: (FileDirectory default fullNameFor: fileName), '.image']) ifFalse: - and: [FileDirectory default fileExists: fileName, '.image']) ifFalse: [ex pass]. FileStream readOnlyFileNamed: fileName, '.image']. ^f ifNil: [self error: 'no image found'. nil].! Item was changed: ----- Method: StackInterpreter>>printCallStackOf: (in category 'debug printing') ----- printCallStackOf: aContextOrProcessOrFrame <public> "useful for VM debugging" | context | <inline: false> self cCode: nil inSmalltalk: [transcript ensureCr]. (stackPages couldBeFramePointer: aContextOrProcessOrFrame) ifTrue: + [^self printCallStackFP: aContextOrProcessOrFrame asCharPointer]. - [^self printCallStackFP: (self cCoerceSimple: aContextOrProcessOrFrame to: #'char *')]. aContextOrProcessOrFrame = self activeProcess ifTrue: [^self printCallStackOf: self headFramePointer]. (self couldBeProcess: aContextOrProcessOrFrame) ifTrue: [^self printCallStackOf: (objectMemory fetchPointer: SuspendedContextIndex ofObject: aContextOrProcessOrFrame)]. context := aContextOrProcessOrFrame. [context = objectMemory nilObject] whileFalse: [(self isMarriedOrWidowedContext: context) ifTrue: [(self checkIsStillMarriedContext: context currentFP: framePointer) ifFalse: [self shortPrintContext: context. ^nil]. context := self shortReversePrintFrameAndCallers: (self frameOfMarriedContext: context)] ifFalse: [context := self printContextCallStackOf: context]]! Item was changed: ----- Method: StackInterpreter>>printFrameThing:at: (in category 'debug printing') ----- printFrameThing: name at: address <inline: #always> <var: #name type: #'char *'> <var: #address type: #'char *'> + self printFrameThing: name at: address extraString: nil asCharPointer! - self printFrameThing: name at: address extraString: (self cCoerceSimple: nil to: #'char *')! Item was changed: ----- Method: StackInterpreter>>printMethodCacheFor: (in category 'debug printing') ----- printMethodCacheFor: thing <public> "useful for VM debugging" | n | n := 0. 0 to: MethodCacheSize - 1 by: MethodCacheEntrySize do: [:i | | s c m p | s := methodCache at: i + MethodCacheSelector. c := methodCache at: i + MethodCacheClass. m := methodCache at: i + MethodCacheMethod. p := methodCache at: i + MethodCachePrimFunction. ((thing = -1 or: [s = thing or: [c = thing or: [p = thing or: [m = thing]]]]) and: [(objectMemory addressCouldBeOop: s) and: [c ~= 0 and: [(self addressCouldBeClassObj: c) or: [self addressCouldBeClassObj: (objectMemory classForClassTag: c)]]]]) ifTrue: [n := n + 1. self cCode: nil inSmalltalk: [self transcript ensureCr]. + '%ld %lx\n\t' f: transcript printf: { i. i }. - self printNum: i; space; printHexnp: i; cr; tab. (objectMemory isBytesNonImm: s) + ifTrue: ['%P %.*s\n' f: transcript printf: { s asVoidPointer. objectMemory numBytesOfBytes: s. (objectMemory firstIndexableField: s) asCharPointer }] - ifTrue: ['%p %.*s\n' f: transcript printf: { s. objectMemory numBytesOfBytes: s. objectMemory firstIndexableField: s }] ifFalse: [self shortPrintOop: s]. self tab. (self addressCouldBeClassObj: c) ifTrue: [self shortPrintOop: c] + ifFalse: [self printNum: c; space; printHexnp: c; space; shortPrintOop: (objectMemory classForClassTag: c)]. - ifFalse: [self printNum: c; space; shortPrintOop: (objectMemory classForClassTag: c)]. self tab; shortPrintOop: m; tab. self cCode: [p > 1024 ifTrue: [self printHexnp: p] ifFalse: [self printNum: p]] inSmalltalk: [p isSymbol ifTrue: [self print: p] ifFalse: [self printNum: p]]. self cr]]. n > 1 ifTrue: [self printNum: n; cr]! Item was changed: ----- Method: StackInterpreter>>printOopShortInner: (in category 'debug printing') ----- printOopShortInner: oop | classOop name nameLen | <var: #name type: #'char *'> <inline: false> (objectMemory isImmediate: oop) ifTrue: [(objectMemory isImmediateCharacter: oop) ifTrue: + [^'$%c(%lx)' f: transcript printf: { self cCoerceSimple: (objectMemory characterValueOf: oop) to: #int. + objectMemory characterValueOf: oop }]. - [^'$%c(%x)' f: transcript printf: { objectMemory characterValueOf: oop. objectMemory characterValueOf: oop }]. (objectMemory isIntegerObject: oop) ifTrue: [^'%ld(16r%lx)' f: transcript printf: { objectMemory integerValueOf: oop. objectMemory integerValueOf: oop }]. (objectMemory isImmediateFloat: oop) ifTrue: [^'%g(16r%lx)' f: transcript printf: {objectMemory dbgFloatValueOf: oop. oop}]. ^'unknown immediate %P' f: transcript printf: oop asVoidPointer]. (objectMemory addressCouldBeObj: oop) ifFalse: [^self print: ((oop bitAnd: objectMemory allocationUnit - 1) ~= 0 ifTrue: [' is misaligned'] ifFalse: [self whereIs: oop])]. (objectMemory isFreeObject: oop) ifTrue: [^self print: ' is a free chunk']. (objectMemory isForwarded: oop) ifTrue: [| target | target := objectMemory followForwarded: oop. ^' is a forwarder to %P' f: transcript printf: target asVoidPointer]. (self isFloatObject: oop) ifTrue: [^self printFloat: (objectMemory dbgFloatValueOf: oop)]. classOop := objectMemory fetchClassOfNonImm: oop. (objectMemory addressCouldBeObj: classOop) ifFalse: [^self print: 'a ??']. (objectMemory numSlotsOf: classOop) = metaclassNumSlots ifTrue: [^self printNameOfClass: oop count: 5]. oop = objectMemory nilObject ifTrue: [^self print: 'nil']. oop = objectMemory trueObject ifTrue: [^self print: 'true']. oop = objectMemory falseObject ifTrue: [^self print: 'false']. nameLen := self lengthOfNameOfClass: classOop. nameLen = 0 ifTrue: [^self print: 'a ??']. name := self nameOfClass: classOop. nameLen = 10 ifTrue: [(self strncmp: name _: 'ByteString' _: 10) = 0 "strncmp is weird" ifTrue: [^self printChar: $'; printStringOf: oop; printChar: $']. (self strncmp: name _: 'ByteSymbol' _: 10) = 0 "strncmp is weird" ifTrue: [self printChar: $#; printStringOf: oop. ^self]]. (nameLen = 9 and: [(self strncmp: name _: 'Character' _: 9) = 0]) ifTrue: [^self printChar: $$; printChar: (objectMemory integerValueOf: (objectMemory fetchPointer: 0 ofObject: oop))]. 'a(n) %.*s' f: transcript printf: { nameLen. name }. "Try to spot association-like things; they're all subclasses of LookupKey" ((objectMemory isPointersNonImm: oop) and: [(objectMemory instanceSizeOf: classOop) = (ValueIndex + 1) and: [(objectMemory isBytes: (objectMemory fetchPointer: KeyIndex ofObject: oop))]]) ifTrue: [| classLookupKey | classLookupKey := objectMemory fetchClassOfNonImm: (objectMemory splObj: SchedulerAssociation). [classLookupKey = objectMemory nilObject ifTrue: [^self]. (objectMemory instanceSizeOf: classLookupKey) = (KeyIndex + 1)] whileFalse: [classLookupKey := self superclassOf: classLookupKey]. (self includesBehavior: classOop ThatOf: classLookupKey) ifTrue: [self space; printOopShortInner: (objectMemory fetchPointer: KeyIndex ofObject: oop); print: ' -> '; printHexnp: (objectMemory fetchPointer: ValueIndex ofObject: oop)]]! Item was added: + ----- Method: String>>asCharPointer (in category '*VMMaker-interpreter simulation') ----- + asCharPointer + ^self! Item was added: + ----- Method: UndefinedObject>>asCharPointer (in category '*VMMaker-interpreter simulator') ----- + asCharPointer + ^self! Item was added: + ----- Method: UndefinedObject>>asVoidPointer (in category '*VMMaker-interpreter simulator') ----- + asVoidPointer + ^self!

1 0

[OpenSmalltalk/opensmalltalk-vm] 772491: CogVM source as per VMMaker.oscog-eem.3374
by Eliot Miranda 12 May '24

12 May '24

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 7724918b22bac8971eb16f3592d4853cc302d9e7 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7724918b22bac8971e… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2024-05-12 (Sun, 12 May 2024) Changed paths: M src/plugins/FilePlugin/FilePlugin.c M src/plugins/FloatMathPlugin/FloatMathPlugin.c M src/plugins/IA32ABI/IA32ABI.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/ARM64AppleFFIPlugin.c M src/plugins/SqueakFFIPrims/ARM64FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/RiscV64FFIPlugin.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/Win32OSProcessPlugin/Win32OSProcessPlugin.c M src/spur32.cog.lowcode/cointerp.c M src/spur32.cog.lowcode/cointerp.h M src/spur32.cog.lowcode/gcc3x-cointerp.c M src/spur32.cog/cointerp.c M src/spur32.cog/cointerp.h M src/spur32.cog/cointerpmt.c M src/spur32.cog/cointerpmt.h M src/spur32.cog/gcc3x-cointerp.c M src/spur32.cog/gcc3x-cointerpmt.c M src/spur32.sista/cointerp.c M src/spur32.sista/cointerp.h M src/spur32.sista/gcc3x-cointerp.c M src/spur32.stack.lowcode/gcc3x-interp.c M src/spur32.stack.lowcode/interp.c M src/spur32.stack.lowcode/interp.h M src/spur32.stack/gcc3x-interp.c M src/spur32.stack/interp.c M src/spur32.stack/validImage.c M src/spur64.cog.lowcode/cointerp.c M src/spur64.cog.lowcode/cointerp.h M src/spur64.cog.lowcode/gcc3x-cointerp.c M src/spur64.cog.lowcode/interp.h M src/spur64.cog/cointerp.c M src/spur64.cog/cointerp.h M src/spur64.cog/cointerpmt.c M src/spur64.cog/cointerpmt.h M src/spur64.cog/gcc3x-cointerp.c M src/spur64.cog/gcc3x-cointerpmt.c M src/spur64.sista/cointerp.c M src/spur64.sista/cointerp.h M src/spur64.sista/gcc3x-cointerp.c M src/spur64.stack.lowcode/gcc3x-interp.c M src/spur64.stack.lowcode/interp.c M src/spur64.stack.lowcode/interp.h M src/spur64.stack/gcc3x-interp.c M src/spur64.stack/interp.c M src/spur64.stack/validImage.c M src/v3.cog/cointerp.c M src/v3.cog/cointerp.h M src/v3.cog/gcc3x-cointerp.c M src/v3.stack/gcc3x-interp.c M src/v3.stack/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3374 Slang: Enhance TParseNode comparison (isSameAs:) with relative label comparison, mapping label values to abstract values using a comparison context object, and passing it as the extra argument to isSameAs:within:. Use this to simplify and improve the horribly hacky duplicate detection in the main interpreter loop. This saves nearly 2k lines (almost 3%) of the code from the Spur multiple bytecode set stack interpreter. Have Slang prune cCode: nil inSmalltalk: as it does for cCode: [] & cCode: ''. Cleanups: arrayFormat is better as a macro. shouldBeTenured: must use oop:isLessThan: instead of <. Eliminate unnecessary newSpace enumerations in the firstInstance/nextInstance implementation. Fix an assert due to recompilation (shape change) in divorceFramesIn:. Eliminate some dead code in the LargeIntegersPlugin and the Cogit. Fix a silly bug in primitiveShowDisplayRect, which checked for argument marcshalling failure *after* using the parameters!! More concise implementation of FloatMathPlugin>>#primitiveLog10. A better fix to the non-inlining of isAlien: in assert: is not to mark isAlien: as <inline: #always> but <inline: true>. A couple of methods should use objectMemory displayObject rather than access TheDisplay directly. To unsubscribe from these emails, change your notification settings at https://github.com/OpenSmalltalk/opensmalltalk-vm/settings/notifications

1 0

VM Maker: VMMaker.oscog-eem.3374.mcz
by commits＠source.squeak.org 12 May '24

12 May '24

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3374.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3374 Author: eem Time: 11 May 2024, 9:23:05.630169 pm UUID: e79c0670-1f06-4b86-a0a5-618a56fb5fe7 Ancestors: VMMaker.oscog-eem.3373 Cleanup. cacheTagLoadInstructionBytes should be inlined. =============== Diff against VMMaker.oscog-eem.3373 =============== Item was changed: ----- Method: CogX64Compiler>>cacheTagLoadInstructionBytes (in category 'accessing') ----- cacheTagLoadInstructionBytes "The inline cache always uses a 32-bit load, which is always 7 bytes" + <inline: #always> ^7!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev