Vm-dev December 2013

vm-dev@lists.squeakfoundation.org

27 participants
102 discussions

Re: [Pharo-dev] Smalltalk in a C World
by Eliot Miranda 09 Dec '13

09 Dec '13

On Mon, Dec 9, 2013 at 2:01 AM, phil(a)highoctane.be <phil(a)highoctane.be>wrote: > The main issue is that it is complicated to embed the VM in C code. > That's due to how the VM is done. > > Compared to TCL, where you can easily embed the interpreter in a C > program, this is a problem. http://wiki.tcl.tk/3474 > > Where you can embed the interpreter in a C program, you can do whatever > integration you want. > > Now, with NativeBoost, we can call C. The next challenge would be to be > able to call Pharo from C by embedding the interpreter. > > I am curious to see what you guys think about this. > It is non-trivial, but possible (I've done it twice with VisualWorks). Spur should help (pinning is important). Callbacks r essential (Cog provides them). 1. the VM is restructured as a launch .exe and a dll. 2. the VM is restructured so that one can include an image as a resource (windows exe's) or static data (e.g. unix); one can use an image file but if one really wants a library it must exist just as a library 3. one needs an API to the VM, and essentially that requires an object request broker (ORB) between the API and callbacks into the image, so that one can query for objects (including selectors) to be able to send messages to them Note that step 3. can be implemented as a small stand-alone library that talks to the VM running in a separate process, and on multi-core machines this can be a more robust architecture; there's no protection against a program corrupting the Smalltalk heap if the heap is in that program's address space. But if the requirement is really a linkable library (that does not spawn processes) then that's what one builds. > I would love to see things like mod_pharo (as there is mod_php, mod_perl, > mod_tcl...) in Apache. > I embedded VW in a web browser as a Netscape plugin using both variants of 3. above back in the 90's. It is very possible. The limiting factors are time and money as usual. I would love for VM discussions to be carried out on vm-dev ;-) --- > Philippe Back > Dramatic Performance Improvements > Mob: +32(0) 478 650 140 | Fax: +32 (0) 70 408 027 > Mail:phil@highoctane.be | Web: http://philippeback.eu > Blog: http://philippeback.be | Twitter: @philippeback > Youtube: http://www.youtube.com/user/philippeback/videos > > High Octane SPRL > rue cour Boisacq 101 | 1301 Bierges | Belgium > > Pharo Consortium Member - http://consortium.pharo.org/ > Featured on the Software Process and Measurement Cast - > http://spamcast.libsyn.com > Sparx Systems Enterprise Architect and Ability Engineering EADocX Value > Added Reseller > > > > > On Mon, Dec 9, 2013 at 9:48 AM, kilon alios <kilon.alios(a)gmail.com> wrote: > >> please note that generating dlls alone wont be enough , plugins are >> compiled against a runtime or specific libraries (a Plugin SDK) and >> Smalltalk MT would have to be able to do that in order to be a viable >> solution. >> >> >> On Mon, Dec 9, 2013 at 10:28 AM, Stéphane Ducasse < >> stephane.ducasse(a)inria.fr> wrote: >> >>> You should think that they use their smalltalk for their projects. >>> >>> Stef >>> >>> On Dec 9, 2013, at 9:21 AM, Clément Bera <bera.clement(a)gmail.com> wrote: >>> >>> How can people even know Smalltalk MT still exist with their website and >>> their communication ? >>> >>> I looked at other Smalltalks a while ago, for Smalltalk MT I clicked on >>> "what's new" on their website and I got that: >>> >>> <Screen Shot 2013-12-09 at 9.18.11 AM.png> >>> >>> Then I thought this Smalltalk was dead (nothing new in the past 4 years) >>> and I didn't look any further. >>> >>> >>> 2013/12/8 Stéphane Ducasse <stephane.ducasse(a)inria.fr> >>> >>>> >>>> > Yes - still alive and kicking. But I'm sure you did not notice since >>>> there >>>> > are no "big" announcements or advertising for it. >>>> > ObjectConnect follows the "time is better invested into technology" >>>> strategy. >>>> > It is one of the most interesting Smalltalks ever implemented. >>>> >>>> http://www.objectconnect.com/stmt_overview.htm >>>> I like the idea that you can get 50kb applications. >>>> Now since this is a closed system and windows-centric. >>>> But I like that it shows that Smalltalk does not have to be the image >>>> centric way. >>>> >>>> > >>>> > The newest ST/MT 6.3 version (now 64 bit) is from end of November 2013 >>>> >>>> Now it is not a community thing. :) >>>> And the web site stop and 5.6 in 2009. >>>> >>>> Last time I talk to tarrick he told me that he could control the "no gc >>>> in the next 250 frames on PS2" >>>> but it was in 1998 :) >>>> >>>> >>>> Stef >>>> >>> >>> >>> >> > -- best, Eliot

2 2

[commit][2822] Merge Lars' latest changes to the GdbARMPlugin ( from a while back).
by commits＠squeakvm.org 09 Dec '13

09 Dec '13

Revision: 2822 Author: eliot Date: 2013-12-09 10:15:54 -0800 (Mon, 09 Dec 2013) Log Message: ----------- Merge Lars' latest changes to the GdbARMPlugin (from a while back). Modified Paths: -------------- trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.win32 trunk/platforms/Cross/plugins/GdbARMPlugin/armulmem.c trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c Added Paths: ----------- trunk/platforms/Cross/plugins/GdbARMPlugin/HowToBuild trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.unix Added: trunk/platforms/Cross/plugins/GdbARMPlugin/HowToBuild =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/HowToBuild (rev 0) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/HowToBuild 2013-12-09 18:15:54 UTC (rev 2822) @@ -0,0 +1,81 @@ +Building the GdbARMPlugin +------------------------------ + +Build the normal VM on your Platform. Consult Cog/{cygwinbuild|unixbuild|macbuild}/HowToBuild +for additional information. +When generating sources, update to the latest +versions of Cog and VMMaker.oscog. +You might want/need to change VMMaker +class>generateSqueakCogVM to point to the right +directories and remove FT2Plugin from the plugin- +list (even if skipped, generates a messageNotUnderstood). +You can also change VMMaker>plugins:do: removing +the return in the false block, in order to skip +when a plugin is not found, instead of aborting +the generation process. + +Building on Windows +------------------------------ +(so far tried with Windows 7 64bit unsing mingw/MSYS 32bit) + +Besides the normal build environment, you need the package gettext. +Also, downgrade your mingwrt package to 3.20 (not 3.20-2) by unpacking +the respective -dev tarball into your mingw-folder. + +When compiling the Squeak VM you need a version 3 gcc/g++. +For configuration of gdb, you need a version 4 gcc (you don't need +to switch g++). For switching between compilers in mingw, +you may use + mingw-get install/remove gcc/gcc-v3/g++/gcc-v3-g++. + +Compile gdb/bfd and gdb/opcodes with a gcc 4.*. + cd <gdb>/bfd + ./configure --enable-targets=arm-linux + make + cd <gdb>/opcodes + ./configure --enable-targets=arm-linux + make +Then switch to gcc-v3. + cd <gdb>/bfd + make clean && make + cd <gdb>/opcodes + make clean && make + +For libsim.a, the gcc version is not important. + cd sim/common + ./configure + cd ../arm + ./configure && make libsim.a + +Change Makefile.win32 to point to your gdb folder. +Then copy the plugin files to your svn-checkout, +for example changing <plugin>/Makefile and running it. +Change <cog>/cygwinbuild/plugins.ext to include GdbARMPlugin. +Change to gcc 3, then build the VM (again). + +Building on Linux +------------------------------ +(so far tried on Ubuntu 12.04 LTS 32bit) + +Download the gdb sources (http://ftp.gnu.org/gnu/gdb) and +unpack them. Change Makefile and Makefile.unix, setting +GDBBUILDFOLDER to the correct place. + +Compile libopcodes.a: + cd GDBBUILDFOLDER + ./configure --enable-targets=arm-linux +Making gdb takes quite some time. It may fail, as long as +it generates <gdb>/bfd/bfd.h and <gdb>/opcodes/libopcodes.a. + make +Compile libsim.a + cd sim/common + ./configure + cd ../arm + ./configure + make +Ensure libsim.a exists in <gdb>/sim/arm. + +Make the plugin which just copies the plugin-files +to the appropriate directories. Then change +Cog/unixbuild/bld/plugins.ext to include GdbARMPlugin. +Build the VM (again). Property changes on: trunk/platforms/Cross/plugins/GdbARMPlugin/HowToBuild ___________________________________________________________________ Added: svn:executable + * Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile 2013-12-06 23:53:30 UTC (rev 2821) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile 2013-12-09 18:15:54 UTC (rev 2822) @@ -1,15 +1,24 @@ +GDBBUILDFOLDER = /d/build/gdb-7.4 + CC = gcc -CFLAGS = -LDFLAGS = libsim.a $(GDBBUILDFOLDER)/opcodes/libopcodes.a -lbfd -lintl -liberty -Wl,-wrap,ARMul_OSHandleSWI -GDBBUILDFOLDER = /d/build/gdb-7.4 +CFLAGS = -I$(GBDBUILDFOLDER)/bfd +LDFLAGS = $(GDBBUILDFOLDER)/sim/arm/libsim.a $(GDBBUILDFOLDER)/opcodes/libopcodes.a -lbfd -lintl -liberty -Wl,-wrap,ARMul_OSHandleSWI -L$(GDBBUILDFOLDER)/bfd/ SHAREDLIBRARYFLAGS = all: - $(CC) $(CFLAGS) armulmem.c -c -I$(GDBBUILDFOLDER)/sim/arm/ - $(CC) $(CFLAGS) sqGdbARMPlugin.c -c -fPIC -I$(GDBBUILDFOLDER)/sim/arm/ - gcc -shared $(SHAREDLIBRARYFLAGS) -o GdbARMPlugin.dll sqGdbARMPlugin.o armulmem.o $(LDFLAGS) -# mkdir ../cog/platforms/Cross/plugins/GdbARMPlugin -# mkdir ../cog/platforms/win32/plugins/GdbARMPlugin +# another test on linux: +# $(CC) $(CFLAGS) armulmem.c -c -I$(GDBBUILDFOLDER)/sim/arm/ -I$(GDBBUILDFOLDER)/include/ +# $(CC) $(CFLAGS) sqGdbARMPlugin.c -c -fPIC -I$(GDBBUILDFOLDER)/sim/arm/ -I$(GDBBUILDFOLDER)/include/ -I$(GDBBUILDFOLDER)/bfd/ +# $(CC) -shared $(SHAREDLIBRARYFLAGS) -o GdbARMPlugin.dll sqGdbARMPlugin.o armulmem.o $(LDFLAGS) + + mkdir -p ../cog/platforms/Cross/plugins/GdbARMPlugin + mkdir -p ../cog/platforms/win32/plugins/GdbARMPlugin + mkdir -p ../cog/platforms/unix/plugins/GdbARMPlugin + cp sqGdbARMPlugin.c GdbARMPlugin.h armulmem.c ../cog/platforms/Cross/plugins/GdbARMPlugin/ cp Makefile.win32 ../cog/platforms/win32/plugins/GdbARMPlugin/Makefile - cd ../cog/cygwinbuild; make + cp Makefile.unix ../cog/platforms/unix/plugins/GdbARMPlugin/Makefile.inc +#unix +# cd ../cog/unixbuild/bld; make install #prefix= +#windows + cd ../cog/cygwinbuild/;make Added: trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.unix =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.unix (rev 0) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.unix 2013-12-09 18:15:54 UTC (rev 2822) @@ -0,0 +1,10 @@ +GDBBUILDFOLDER = $(topdir)/../gdb +XCFLAGS = -m32 -DNEED_UI_LOOP_HOOK + +XINCLUDES += -I$(GDBBUILDFOLDER)/sim/arm +XINCLUDES := -I$(GDBBUILDFOLDER)/bfd $(XINCLUDES) + +XLDFLAGS= $(GDBBUILDFOLDER)/sim/arm/libsim.a \ + $(GDBBUILDFOLDER)/opcodes/libopcodes.a \ + -lbfd -liberty \ + -Wl,-wrap,ARMul_OSHandleSWI Property changes on: trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.unix ___________________________________________________________________ Added: svn:executable + * Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.win32 =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.win32 2013-12-06 23:53:30 UTC (rev 2821) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.win32 2013-12-09 18:15:54 UTC (rev 2822) @@ -1,14 +1,13 @@ -DLLTOOLEXTRA := /d/Dateien/cog/squeakvm-armulator-plugin/libsim.a \ - /d/build/gdb-7.4/opcodes/libopcodes.a -DLLWRAPEXTRA := $(DLLTOOLEXTRA) +GDBBUILDFOLDER = /d/Programming/cog/gdb LINK_WITH_GPP := yes -EXTRALIBS:= -L/d/Dateien/cog/squeakvm-armulator-plugin \ - -L/d/build/gdb-7.4/opcodes \ +EXTRALIBS:= -L$(GDBBUILDFOLDER)/opcodes \ + -L$(GDBBUILDFOLDER)/sim/arm \ -lsim -lopcodes -lbfd -lintl -liberty -Wl,-wrap,ARMul_OSHandleSWI include ../../Makefile.plugin -INCLUDES:= $(INCLUDES) -I/d/build/gdb-7.4/sim/arm +INCLUDES:= $(INCLUDES) -I$(GDBBUILDFOLDER)/sim/arm - +# Copy libgcc_s_dw2-1.dll, libiconv-2.dll and libintl-8.dll from your MinGW/bin +# folder to the VM folder, to make it work on other Windows (7?) systems Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/armulmem.c =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/armulmem.c 2013-12-06 23:53:30 UTC (rev 2821) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/armulmem.c 2013-12-09 18:15:54 UTC (rev 2822) @@ -73,7 +73,7 @@ //raise memory access error state->EndCondition = MemoryBoundsError; state->Emulate = FALSE; - gdb_log_printf(NULL, "Illegal memory read at 0x%p. ", address); + gdb_log_printf(NULL, "Illegal memory read at %#p. ", address); return 0; } else @@ -93,7 +93,7 @@ { state->Emulate = FALSE; state->EndCondition = MemoryBoundsError; - gdb_log_printf(NULL, "Illegal memory write at 0x%p. ", address); + gdb_log_printf(NULL, "Illegal memory write at %#p. ", address); } else { Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c 2013-12-06 23:53:30 UTC (rev 2821) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c 2013-12-09 18:15:54 UTC (rev 2822) @@ -15,6 +15,9 @@ ARMul_State* lastCPU = NULL; +/* When compiling armulator, it generally sets NEED_UI_LOOP_HOOK, which + makes the main emulation step require this symbol to be set. */ +extern int (*deprecated_ui_loop_hook) (int) = NULL; // These two variables exist, in case there are library-functions which write to a stream. // In that case, we would write functions which print to that stream instead of stderr or similar @@ -112,9 +115,8 @@ return runOnCPU(cpu, memory, byteSize, minAddr, minWriteMaxExecAddr, ARMul_DoProg); } -// next functions reason for existence is not clear /* - * Currently a dummy for Bochs. + * Currently a dummy for ARM Processor Alien. */ void flushICacheFromTo(void *cpu, ulong saddr, ulong eaddr) @@ -158,23 +160,14 @@ // sets some fields in the structure dis to architecture specific values disassemble_init_for_target( dis ); - // Given a bfd, the disassembler can find the arch by itself. - // Unfortunately, we don't have bfd-structures, so we have to choose the function by hand. - //disassemble = disassembler( c ); - disassembler_ftype disassembler = print_insn_little_arm; - //other possible functions are listed in opcodes/dissassemble.c dis->buffer_vma = 0; dis->buffer = memory; dis->buffer_length = byteSize; - // while-loop for calling single instruction decoding: - unsigned int isize = 0; - size_t pos = laddr; - size_t max_pos = dis->buffer_vma+dis->buffer_length; + //other possible functions are listed in opcodes/dissassemble.c + unsigned int size = print_insn_little_arm((bfd_vma) laddr, dis); - unsigned int size = disassembler((bfd_vma) pos, dis); - free(dis); gdb_log[gdblog_index+1] = 0; @@ -212,7 +205,7 @@ state->EndCondition = MemoryBoundsError; // during execution, the pc points the next fetch address, which is 8 byte after the current instruction. - gdb_log_printf(NULL, "Illegal Instruction fetch address (0x%p).", state->Reg[15]-8); + gdb_log_printf(NULL, "Illegal Instruction fetch address (%#p).", state->Reg[15]-8); return TRUE; } return __real_ARMul_OSHandleSWI(state, number);

1 0

VM Maker: Cog-eem.126.mcz
by commits＠source.squeak.org 09 Dec '13

09 Dec '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.126.mcz ==================== Summary ==================== Name: Cog-eem.126 Author: eem Time: 9 December 2013, 10:06:03.398 am UUID: b095a0d7-06da-45d6-b21e-e6977328df30 Ancestors: Cog-eem.125 Refactor register state printing to provide printRegisterStateExceptPC:on: =============== Diff against Cog-eem.125 =============== Item was added: + ----- Method: BochsIA32Alien>>printFields:inRegisterState:on: (in category 'printing') ----- + printFields: fields inRegisterState: registerStateVector on: aStream + | rsvs | + aStream ensureCr. + rsvs := registerStateVector readStream. + fields withIndexDo: + [:sym :index| | val | + sym = #cr + ifTrue: [aStream cr] + ifFalse: + [(val := rsvs next) isNil ifTrue: [^self]. + (sym beginsWith: 'xmm') + ifTrue: + [aStream nextPutAll: sym; nextPut: $:; space. + val printOn: aStream base: 16 length: 16 padded: true. + aStream space; nextPut: $(. + "At the image level Float is apparently in big-endian format" + ((Float basicNew: 2) + at: 2 put: (val bitAnd: 16rFFFFFFFF); + at: 1 put: (val bitShift: -32); + yourself) + printOn: aStream. + aStream nextPut: $)] + ifFalse: + [aStream nextPutAll: sym; nextPut: $:; space. + val printOn: aStream base: 16 length: 8 padded: true. + #eflags == sym + ifTrue: + [aStream space. + 'C-P-A-ZS---O' withIndexDo: + [:flag :bitIndex| + flag ~= $- ifTrue: + [aStream nextPut: flag; nextPutAll: 'F='; print: (val bitAnd: 1 << (bitIndex - 1)) >> (bitIndex - 1); space]]] + ifFalse: + [val > 16 ifTrue: + [aStream space; nextPut: $(. + val printOn: aStream base: 10 length: 1 padded: false. + aStream nextPut: $)]]]. + (fields at: index + 1) ~~ #cr ifTrue: + [aStream tab]]]! Item was changed: ----- Method: BochsIA32Alien>>printRegisterState:on: (in category 'printing') ----- printRegisterState: registerStateVector on: aStream + self printFields: + ((registerStateVector size < 18 + or: [(11 to: 18) allSatisfy: [:i| (registerStateVector at: i) isZero]]) - | rsvs fields| - aStream ensureCr. - rsvs := registerStateVector readStream. - fields := (registerStateVector size < 18 - or: [(11 to: 18) allSatisfy: [:i| (registerStateVector at: i) isZero]]) ifTrue: [#( eax ebx ecx edx cr esp ebp esi edi cr eip eflags cr )] ifFalse: [#( eax ebx ecx edx cr esp ebp esi edi cr eip eflags cr xmm0low xmm1low cr xmm2low xmm3low cr xmm4low xmm5low cr + xmm6low xmm7low cr )]) + inRegisterState: registerStateVector + on: aStream! - xmm6low xmm7low cr )]. - fields withIndexDo: - [:sym :index| | val | - sym = #cr - ifTrue: [aStream cr] - ifFalse: - [(val := rsvs next) isNil ifTrue: [^self]. - (sym beginsWith: 'xmm') - ifTrue: - [aStream nextPutAll: sym; nextPut: $:; space. - val printOn: aStream base: 16 length: 16 padded: true. - aStream space; nextPut: $(. - "At the image level Float is apparently in big-endian format" - ((Float basicNew: 2) - at: 2 put: (val bitAnd: 16rFFFFFFFF); - at: 1 put: (val bitShift: -32); - yourself) - printOn: aStream. - aStream nextPut: $)] - ifFalse: - [aStream nextPutAll: sym; nextPut: $:; space. - val printOn: aStream base: 16 length: 8 padded: true. - #eflags == sym - ifTrue: - [aStream space. - 'C-P-A-ZS---O' withIndexDo: - [:flag :bitIndex| - flag ~= $- ifTrue: - [aStream nextPut: flag; nextPutAll: 'F='; print: (val bitAnd: 1 << (bitIndex - 1)) >> (bitIndex - 1); space]]] - ifFalse: - [val > 16 ifTrue: - [aStream space; nextPut: $(. - val printOn: aStream base: 10 length: 1 padded: false. - aStream nextPut: $)]]]. - (fields at: index + 1) ~~ #cr ifTrue: - [aStream tab]]]! Item was added: + ----- Method: BochsIA32Alien>>printRegisterStateExceptPC:on: (in category 'printing') ----- + printRegisterStateExceptPC: registerStateVector on: aStream + self printFields: + ((registerStateVector size < 18 + or: [(11 to: 18) allSatisfy: [:i| (registerStateVector at: i) isZero]]) + ifTrue: + [#( eax ebx ecx edx cr + esp ebp esi edi cr)] + ifFalse: + [#( eax ebx ecx edx cr + esp ebp esi edi cr + xmm0low xmm1low cr + xmm2low xmm3low cr + xmm4low xmm5low cr + xmm6low xmm7low cr )]) + inRegisterState: registerStateVector + on: aStream! Item was added: + ----- Method: GdbARMAlien>>printFields:inRegisterState:on: (in category 'printing') ----- + printFields: fields inRegisterState: registerStateVector on: aStream + | rsvs | + aStream ensureCr. + rsvs := registerStateVector readStream. + fields withIndexDo: + [:sym :index| | val | + sym = #cr + ifTrue: [aStream cr] + ifFalse: + [(val := rsvs next) isNil ifTrue: [^self]. + aStream nextPutAll: sym; nextPut: $:; space. + val printOn: aStream base: 16 length: 8 padded: true. + #eflags == sym + ifTrue: + [aStream space. + "'FIVCZN'"'--VCZN' withIndexDo: + [:flag :bitIndex| + flag ~= $- ifTrue: + [aStream nextPut: flag; nextPutAll: 'F='; print: (val bitAnd: 1 << (bitIndex - 1)) >> (bitIndex - 1); space]]] + ifFalse: + [val > 16 ifTrue: + [aStream space; nextPut: $(. + val printOn: aStream base: 10 length: 1 padded: false. + aStream nextPut: $)]]. + (fields at: index + 1) ~~ #cr ifTrue: + [aStream tab]]]! Item was changed: ----- Method: GdbARMAlien>>printRegisterState:on: (in category 'printing') ----- printRegisterState: registerStateVector on: aStream + self printFields: #( r0 r1 r2 r3 cr + r4 r5 r6 r7 cr + r8 r9 r10 r11 cr + r12 sp lr pc eflags cr) + inRegisterState: registerStateVector + on: aStream! - | rsvs fields| - aStream ensureCr. - rsvs := registerStateVector readStream. - fields := #( r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 sp lr pc eflags cr). - fields withIndexDo: - [:sym :index| | val | - sym = #cr - ifTrue: [aStream cr] - ifFalse: - [(val := rsvs next) isNil ifTrue: [^self]. - aStream nextPutAll: sym; nextPut: $:; space. - val printOn: aStream base: 16 length: 8 padded: true. - #eflags == sym - ifTrue: - [aStream space. - "'FIVCZN'"'--VCZN' withIndexDo: - [:flag :bitIndex| - flag ~= $- ifTrue: - [aStream nextPut: flag; nextPutAll: 'F='; print: (val bitAnd: 1 << (bitIndex - 1)) >> (bitIndex - 1); space]]] - ifFalse: - [val > 16 ifTrue: - [aStream space; nextPut: $(. - val printOn: aStream base: 10 length: 1 padded: false. - aStream nextPut: $)]]. - (fields at: index + 1) ~~ #cr ifTrue: - [aStream tab]]]! Item was added: + ----- Method: GdbARMAlien>>printRegisterStateExceptPC:on: (in category 'printing') ----- + printRegisterStateExceptPC: registerStateVector on: aStream + self printFields: #( r0 r1 r2 r3 cr + r4 r5 r6 r7 cr + r8 r9 r10 r11 cr + r12 sp lr eflags cr) + inRegisterState: registerStateVector + on: aStream!

1 0

VM Maker: VMMaker.oscog-eem.550.mcz
by commits＠source.squeak.org 09 Dec '13

09 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.550.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.550 Author: eem Time: 9 December 2013, 7:21:47.972 am UUID: 16788219-a25c-487e-bdff-d01a799e4550 Ancestors: VMMaker.oscog-eem.549 Include api methods in conditional expr dead-code removal code. Rewrite CoInterpreter senders of numRegArgs given they can now be handled by dead code removal instead of clunky old cppIf:ifTrue:. Include the classIndex in the longPrintOop: class output. Fix comments and and remove duplicate alignment in both compileOpenPIC:numArgs: methods. Fix comment in genSendTrampolineFor:numArgs:called:arg:arg:arg: =============== Diff against VMMaker.oscog-eem.549 =============== Item was added: + ----- Method: CCodeGenerator>>isConstantNode:valueInto: (in category 'utilities') ----- + isConstantNode: aNode valueInto: aBlock + "Answer if aNode evaluates to a constant, and if so, evaluate aBlock with the value of that constant." + + aNode isConstant ifTrue: + [aBlock value: aNode value. + ^true]. + aNode isSend ifFalse: + [^false]. + (self anyMethodNamed: aNode selector) ifNotNil: + [:m| + (m statements size = 1 + and: [m statements last isReturn]) ifTrue: + [^self isConstantNode: m statements last expression valueInto: aBlock]]. + ^false! Item was changed: ----- Method: CCodeGenerator>>isNilConstantReceiverOf: (in category 'utilities') ----- isNilConstantReceiverOf: sendNode "Answer true if the receiver of the given message send is the constant nil. Used to suppress conditional code when the condition is a translation-time constant." + | val | generateDeadCode ifTrue: [^false]. + ^(self isConstantNode: sendNode receiver valueInto: [:v| val := v]) + and: [val isNil]! - ^sendNode receiver isConstant and: [sendNode receiver value isNil]! Item was changed: ----- Method: CCodeGenerator>>nilOrBooleanConstantReceiverOf: (in category 'utilities') ----- nilOrBooleanConstantReceiverOf: aNode "Answer nil or the boolean constant that is the receiver of the given message send. Used to suppress conditional code when the condition is a translation-time constant." + | val receiver argument | generateDeadCode ifTrue:[^nil]. + ((self isConstantNode: aNode valueInto: [:v| val := v]) + and: [#(true false) includes: val]) ifTrue: + [^val]. - (aNode isConstant - and: [#(true false) includes: aNode value]) ifTrue: - [^aNode value]. aNode isSend ifTrue: [((#(or: and:) includes: aNode selector) and: [aNode args last isStmtList and: [aNode args last statements size = 1]]) ifTrue: [(self nilOrBooleanConstantReceiverOf: aNode receiver) ifNotNil: [:rcvr| (self nilOrBooleanConstantReceiverOf: aNode args last statements first) ifNotNil: [:arg| ^rcvr perform: aNode selector with: [arg]]]]. ((#(= ~= < > <= >=) includes: aNode selector) + and: [(self isConstantNode: aNode receiver valueInto: [:v| receiver := v]) + and: [receiver isInteger + and: [(self isConstantNode: aNode args first valueInto: [:v| argument := v]) + and: [argument isInteger]]]]) ifTrue: + [^receiver perform: aNode selector with: argument]]. + ^nil! - and: [(aNode receiver isConstant and: [aNode receiver value isInteger]) - and: [(aNode args first isConstant and: [aNode args first value isInteger])]]) ifTrue: - [^aNode receiver value perform: aNode selector with: aNode args first value]. - (self methodNamed: aNode selector) ifNotNil: - [:m| - (m statements size = 1 - and: [m statements last isReturn]) ifTrue: - [^self nilOrBooleanConstantReceiverOf: m statements last expression]]]. - ^nil - ! Item was changed: ----- Method: CoInterpreter>>activateCoggedNewMethod: (in category 'message sending') ----- activateCoggedNewMethod: inInterpreter "Activate newMethod when newMethod has been cogged, i.e. create a machine-code frame and (re)enter machine-code." | methodHeader cogMethod rcvr numTemps errorCode switched | <var: #cogMethod type: #'CogMethod *'> methodHeader := self rawHeaderOf: newMethod. self assert: (self isCogMethodReference: methodHeader). cogMethod := self cCoerceSimple: methodHeader to: #'CogMethod *'. methodHeader := cogMethod methodHeader. rcvr := self stackValue: cogMethod cmNumArgs. "could new rcvr be set at point of send?" self push: instructionPointer. cogMethod stackCheckOffset = 0 ifTrue: ["frameless method; nothing to activate..." + (cogit numRegArgs > 0 + and: [cogMethod cmNumArgs <= cogit numRegArgs]) ifTrue: + [self enterRegisterArgCogMethod: cogMethod at: cogit noCheckEntryOffset receiver: rcvr]. - self - cppIf: cogit numRegArgs > 0 - ifTrue: - [cogMethod cmNumArgs <= cogit numRegArgs ifTrue: - [self enterRegisterArgCogMethod: cogMethod at: cogit noCheckEntryOffset receiver: rcvr]]. self push: cogMethod asInteger + cogit noCheckEntryOffset. self push: rcvr. cogit ceEnterCogCodePopReceiverReg. self error: 'should not be reached']. self push: framePointer. framePointer := stackPointer. self push: cogMethod asInteger. self push: objectMemory nilObject. "FxThisContext field" self push: rcvr. "clear remaining temps to nil" numTemps := self temporaryCountOfMethodHeader: methodHeader. cogMethod cmNumArgs + 1 to: numTemps do: [:i | self push: objectMemory nilObject]. (self methodHeaderHasPrimitive: methodHeader) ifTrue: [| initialPC | "Store the error code if the method starts with a long store temp. No instructionPointer skip because we're heading for machine code." initialPC := (self initialPCForHeader: methodHeader method: newMethod) + (self sizeOfCallPrimitiveBytecode: methodHeader). primFailCode ~= 0 ifTrue: [(objectMemory byteAt: initialPC) = (self longStoreBytecodeForHeader: methodHeader) ifTrue: [errorCode := self getErrorObjectFromPrimFailCode. self stackTopPut: errorCode "nil if primFailCode == 1, or primFailCode"]. primFailCode := 0]]. "Now check for stack overflow or an event (interrupt, must scavenge, etc)." stackPointer >= stackLimit ifTrue: [self assert: cogMethod stackCheckOffset > cogit noCheckEntryOffset. self push: cogMethod asInteger + cogMethod stackCheckOffset. self push: rcvr. cogit ceEnterCogCodePopReceiverReg. self error: 'should not be reached']. instructionPointer := cogMethod asInteger + cogMethod stackCheckOffset. switched := self handleStackOverflowOrEventAllowContextSwitch: (self canContextSwitchIfActivating: newMethod header: methodHeader). self returnToExecutive: inInterpreter postContextSwitch: switched! Item was changed: ----- Method: CoInterpreter>>enterRegisterArgCogMethod:at:receiver: (in category 'enilopmarts') ----- enterRegisterArgCogMethod: cogMethod at: entryOffset receiver: rcvr "convert rcvr base arg(s) retpc <- sp to retpc base entrypc rcvr arg(s) <- sp and then enter at either the checked or the unchecked entry-point." <var: #cogMethod type: #'CogMethod *'> + self assert: (cogit numRegArgs > 0 and: [cogit numRegArgs <= 2 and: [cogMethod cmNumArgs <= cogit numRegArgs]]). + cogMethod cmNumArgs = 2 ifTrue: + [self stackValue: 3 put: self stackTop. "retpc" + self push: (self stackValue: 1). "last arg" + self stackValue: 1 put: (self stackValue: 3). "first arg" + self stackValue: 2 put: rcvr. + self stackValue: 3 put: cogMethod asInteger + entryOffset. + cogit ceEnterCogCodePopReceiverArg1Arg0Regs + "NOTREACHED"]. + cogMethod cmNumArgs = 1 ifTrue: + [self stackValue: 2 put: self stackTop. "retpc" + self push: (self stackValue: 1). "arg" + self stackValue: 1 put: rcvr. + self stackValue: 2 put: cogMethod asInteger + entryOffset. + cogit ceEnterCogCodePopReceiverArg0Regs + "NOTREACHED"]. + self assert: cogMethod cmNumArgs = 0. + self stackValue: 1 put: self stackTop. "retpc" + self stackValue: 0 put: cogMethod asInteger + entryOffset. + self push: rcvr. + cogit ceEnterCogCodePopReceiverReg + "NOTREACHED"! - self cppIf: cogit numRegArgs > 0 - ifTrue: - [self assert: (cogit numRegArgs > 0 and: [cogit numRegArgs <= 2]). - cogMethod cmNumArgs = 2 ifTrue: - [self stackValue: 3 put: self stackTop. "retpc" - self push: (self stackValue: 1). "last arg" - self stackValue: 1 put: (self stackValue: 3). "first arg" - self stackValue: 2 put: rcvr. - self stackValue: 3 put: cogMethod asInteger + entryOffset. - cogit ceEnterCogCodePopReceiverArg1Arg0Regs - "NOTREACHED"]. - cogMethod cmNumArgs = 1 ifTrue: - [self stackValue: 2 put: self stackTop. "retpc" - self push: (self stackValue: 1). "arg" - self stackValue: 1 put: rcvr. - self stackValue: 2 put: cogMethod asInteger + entryOffset. - cogit ceEnterCogCodePopReceiverArg0Regs - "NOTREACHED"]. - self assert: cogMethod cmNumArgs = 0. - self stackValue: 1 put: self stackTop. "retpc" - self stackValue: 0 put: cogMethod asInteger + entryOffset. - self push: rcvr. - cogit ceEnterCogCodePopReceiverReg - "NOTREACHED"] - ifFalse: - [self assert: false]! Item was changed: ----- Method: CoInterpreter>>executeCogMethodFromLinkedSend:withReceiver: (in category 'enilopmarts') ----- executeCogMethodFromLinkedSend: cogMethod withReceiver: rcvr <api> "Execute a CogMethod from a linked send. The receiver, arguments and return address are on the Smalltalk stack. First push the entry-point and finally the register argument(s). Then write back the frame pointers and call the routine that will pop off the register argument(s) and jump to the entry by executing a return instruction. In the simple jit only the receiver gets passed in registers, so only the receiver gets pushed." <var: #cogMethod type: #'CogMethod *'> cogit assertCStackWellAligned. self assert: (self isMachineCodeFrame: framePointer). self assertValidExecutionPointe: self stackTop r: framePointer s: stackPointer imbar: false line: #'__LINE__'. + (cogit numRegArgs > 0 + and: [cogMethod cmNumArgs <= cogit numRegArgs]) ifTrue: + [self enterRegisterArgCogMethod: cogMethod at: cogit entryOffset receiver: rcvr]. self - cppIf: cogit numRegArgs > 0 - ifTrue: - [cogMethod cmNumArgs <= cogit numRegArgs ifTrue: - [self enterRegisterArgCogMethod: cogMethod at: cogit entryOffset receiver: rcvr]]. - self push: cogMethod asInteger + cogit entryOffset; push: rcvr. cogit ceEnterCogCodePopReceiverReg "NOTREACHED"! Item was changed: ----- Method: CoInterpreter>>executeCogMethodFromLinkedSend:withReceiver:andCacheTag: (in category 'enilopmarts') ----- executeCogMethodFromLinkedSend: cogMethod withReceiver: rcvr andCacheTag: cacheTag <api> "Execute a CogMethod from a linked send. The receiver, arguments and return address are on the Smalltalk stack. First push the entry-point and finally the register argument(s). Then write back the frame pointers and call the routine that will pop off the register argument(s) and jump to the entry by executing a return instruction. In the simple jit only the receiver gets passed in registers, so only the receiver gets pushed." <var: #cogMethod type: #'CogMethod *'> cogit assertCStackWellAligned. self assert: (self isMachineCodeFrame: framePointer). self assertValidExecutionPointe: self stackTop r: framePointer s: stackPointer imbar: false line: #'__LINE__'. self push: cogMethod asInteger + cogit entryOffset. + cogit numRegArgs > 0 ifTrue: + [cogMethod cmNumArgs <= cogit numRegArgs ifTrue: + [self assert: cogit numRegArgs <= 2. + self push: cacheTag. + cogMethod cmNumArgs = 0 ifTrue: + [cogit ceEnter0ArgsPIC]. + cogMethod cmNumArgs = 1 ifTrue: + [cogit ceEnter1ArgsPIC]. + cogMethod cmNumArgs = 2 ifTrue: + [cogit ceEnter2ArgsPIC]. + self error: 'not reached']]. self - cppIf: cogit numRegArgs > 0 - ifTrue: - [cogMethod cmNumArgs <= cogit numRegArgs ifTrue: - [self assert: cogit numRegArgs <= 2. - self push: cacheTag. - cogMethod cmNumArgs = 0 ifTrue: - [cogit ceEnter0ArgsPIC]. - cogMethod cmNumArgs = 1 ifTrue: - [cogit ceEnter1ArgsPIC]. - cogMethod cmNumArgs = 2 ifTrue: - [cogit ceEnter2ArgsPIC]. - self error: 'not reached']]. - self push: rcvr; push: cacheTag. cogit ceEnterCogCodePopReceiverAndClassRegs "NOTREACHED"! Item was changed: ----- Method: CoInterpreter>>executeCogMethodFromUnlinkedSend:withReceiver: (in category 'enilopmarts') ----- executeCogMethodFromUnlinkedSend: cogMethod withReceiver: rcvr "Execute a CogMethod from an unlinked send. The receiver, arguments and return address are on the Smalltalk stack. First push the entry-point and finally the register argument(s). Then write back the frame pointers and call the routine that will pop off the register argument(s) and jump to the entry by executing a return instruction. In the simple jit only the receiver gets passed in registers, so only the receiver gets pushed." <var: #cogMethod type: #'CogMethod *'> cogit assertCStackWellAligned. self assert: (self isMachineCodeFrame: framePointer). self assertValidExecutionPointe: self stackTop r: framePointer s: stackPointer imbar: false line: #'__LINE__'. + (cogit numRegArgs > 0 + and: [cogMethod cmNumArgs <= cogit numRegArgs]) ifTrue: + [self enterRegisterArgCogMethod: cogMethod at: cogit noCheckEntryOffset receiver: rcvr]. self - cppIf: cogit numRegArgs > 0 - ifTrue: - [cogMethod cmNumArgs <= cogit numRegArgs ifTrue: - [self enterRegisterArgCogMethod: cogMethod at: cogit noCheckEntryOffset receiver: rcvr]]. - self push: cogMethod asInteger + cogit noCheckEntryOffset; push: rcvr. cogit ceEnterCogCodePopReceiverReg "NOTREACHED"! Item was changed: ----- Method: SimpleStackBasedCogit>>compileOpenPIC:numArgs: (in category 'in-line cacheing') ----- compileOpenPIC: selector numArgs: numArgs "Compile the code for an open PIC. Perform a probe of the first-level method lookup cache followed by a call of ceSendFromInLineCacheMiss: if the probe fails." | jumpSelectorMiss jumpClassMiss itsAHit jumpBCMethod routine | <var: #jumpSelectorMiss type: #'AbstractInstruction *'> <var: #jumpClassMiss type: #'AbstractInstruction *'> <var: #itsAHit type: #'AbstractInstruction *'> <var: #jumpBCMethod type: #'AbstractInstruction *'> self compilePICProlog: numArgs. + entry := objectRepresentation genGetClassTagOf: ReceiverResultReg into: ClassReg scratchReg: TempReg. - self AlignmentNops: (BytesPerWord max: 8). - entry := self Label. - objectRepresentation genGetClassTagOf: ReceiverResultReg into: ClassReg scratchReg: TempReg. + "Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag:" + self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:class:" - "Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:class:" - self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:classTag:" self MoveR: ClassReg R: SendNumArgsReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. self LogicalShiftLeftCq: ShiftForWord R: ClassReg. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. jumpClassMiss := self JumpNonZero: 0. itsAHit := self Label. "Fetch the method. The interpret trampoline requires the bytecoded method in SendNumArgsReg" self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheMethod << ShiftForWord) r: ClassReg R: SendNumArgsReg. "If the method is compiled jump to its unchecked entry-point, otherwise interpret it." objectRepresentation genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: TempReg. self MoveR: TempReg R: ClassReg. jumpBCMethod := objectRepresentation genJumpSmallIntegerInScratchReg: TempReg. jumpBCMethod jmpTarget: interpretCall. self AddCq: cmNoCheckEntryOffset R: ClassReg. self JumpR: ClassReg. "First probe missed. Do second of three probes. Shift hash right one and retry." jumpSelectorMiss jmpTarget: (jumpClassMiss jmpTarget: self Label). self MoveR: SendNumArgsReg R: ClassReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. self LogicalShiftLeftCq: ShiftForWord - 1 R: ClassReg. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. self JumpZero: itsAHit. "Second probe missed. Do last probe. Shift hash right two and retry." jumpSelectorMiss jmpTarget: self Label. self MoveR: SendNumArgsReg R: ClassReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. ShiftForWord > 2 ifTrue: [self LogicalShiftLeftCq: ShiftForWord - 1 R: ClassReg]. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. self JumpZero: itsAHit. "Last probe missed. Call ceSendFromInLineCacheMiss: to do the full lookup." jumpSelectorMiss jmpTarget: self Label. self genSaveStackPointers. self genLoadCStackPointers. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: SendNumArgsReg)). cStackAlignment > BytesPerWord ifTrue: [backEnd genAlignCStackSavingRegisters: false numArgs: 1 wordAlignment: cStackAlignment / BytesPerWord]. backEnd genPassReg: SendNumArgsReg asArgument: 0. routine := self cCode: '(sqInt)ceSendFromInLineCacheMiss' inSmalltalk: [self simulatedAddressFor: #ceSendFromInLineCacheMiss:]. self annotateCall: (self Call: routine) "Note that this call does not return."! Item was changed: ----- Method: SimpleStackBasedCogit>>numRegArgs (in category 'testing') ----- numRegArgs <api> - "Use of the macro allows the compiler to avoid the call and test in cointerpreter.c" - <cmacro: '() 0'> ^0! Item was changed: ----- Method: StackInterpreter>>longPrintOop: (in category 'debug printing') ----- longPrintOop: oop <api> | fmt lastIndex startIP bytecodesPerLine column | ((objectMemory isImmediate: oop) or: [(objectMemory addressCouldBeObj: oop) not or: [(oop bitAnd: objectMemory allocationUnit - 1) ~= 0 or: [(objectMemory isFreeObject: oop) or: [objectMemory isForwarded: oop]]]]) ifTrue: [self printOop: oop. ^self]. self printHex: oop. (objectMemory fetchClassOfNonImm: oop) ifNil: [self print: ' has a nil class!!!!'] ifNotNil: [:class| self print: ': a(n) '; printNameOfClass: class count: 5; + print: ' ('. + objectMemory hasSpurMemoryManagerAPI ifTrue: + [self printHexnp: (objectMemory compactClassIndexOf: oop); print: '=>']. + self printHexnp: class; print: ')']. - print: ' ('; printHex: class; print: ')']. fmt := objectMemory formatOf: oop. self print: ' format '; printHexnp: fmt. fmt > objectMemory lastPointerFormat ifTrue: [self print: ' nbytes '; printNum: (objectMemory byteLengthOf: oop)] ifFalse: [(objectMemory isIndexableFormat: fmt) ifTrue: [| len | len := objectMemory lengthOf: oop. self print: ' size '; printNum: len - (objectMemory fixedFieldsOf: oop format: fmt length: len)]]. objectMemory printHeaderTypeOf: oop. self print: ' hash '; printHexnp: (objectMemory rawHashBitsOf: oop). self cr. (fmt between: objectMemory firstByteFormat and: objectMemory firstCompiledMethodFormat - 1) ifTrue: [^self printStringOf: oop; cr]. (fmt between: objectMemory firstLongFormat and: objectMemory firstByteFormat - 1) ifTrue: [^self]. "this is nonsense. apologies." startIP := (objectMemory lastPointerOf: oop) + BytesPerOop - objectMemory baseHeaderSize / BytesPerOop. 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 cCode: [self printOopShort: fieldOop] inSmalltalk: [self print: (self shortPrint: fieldOop)]]. self cr]]. (objectMemory isCompiledMethod: oop) ifFalse: [startIP > 64 ifTrue: [self print: '...'; cr]] ifTrue: [startIP := startIP * BytesPerWord + 1. lastIndex := objectMemory lengthOf: oop. lastIndex - startIP > 100 ifTrue: [lastIndex := startIP + 100]. bytecodesPerLine := 8. column := 1. startIP to: lastIndex do: [:index| | byte | column = 1 ifTrue: [self cCode: 'printf("0x%08x: ", oop+BaseHeaderSize+index-1)' inSmalltalk: [self print: (oop+BaseHeaderSize+index-1) hex; print: ': ']]. byte := objectMemory fetchByte: index - 1 ofObject: oop. self cCode: 'printf(" %02x/%-3d", byte,byte)' inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte]. column := column + 1. column > bytecodesPerLine ifTrue: [column := 1. self cr]]. column = 1 ifFalse: [self cr]]! Item was changed: ----- Method: StackToRegisterMapping2RegArgsCogit>>numRegArgs (in category 'calling convention') ----- numRegArgs <api> - "Use of the macro allows the compiler to avoid the call and test in cointerpreter.c" - <cmacro: '() 2'> ^2! Item was changed: ----- Method: StackToRegisterMappingCogit>>compileOpenPIC:numArgs: (in category 'in-line cacheing') ----- compileOpenPIC: selector numArgs: numArgs "Compile the code for an open PIC. Perform a probe of the first-level method lookup cache followed by a call of ceSendFromInLineCacheMiss: if the probe fails. Override to push the register args when calling ceSendFromInLineCacheMiss:" | jumpSelectorMiss jumpClassMiss itsAHit jumpBCMethod routine | <var: #jumpSelectorMiss type: #'AbstractInstruction *'> <var: #jumpClassMiss type: #'AbstractInstruction *'> <var: #itsAHit type: #'AbstractInstruction *'> <var: #jumpBCMethod type: #'AbstractInstruction *'> self compilePICProlog: numArgs. entry := objectRepresentation genGetClassTagOf: ReceiverResultReg into: ClassReg scratchReg: TempReg. "Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag:" self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:class:" self MoveR: ClassReg R: SendNumArgsReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. self LogicalShiftLeftCq: ShiftForWord R: ClassReg. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. jumpClassMiss := self JumpNonZero: 0. itsAHit := self Label. "Fetch the method. The interpret trampoline requires the bytecoded method in SendNumArgsReg" self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheMethod << ShiftForWord) r: ClassReg R: SendNumArgsReg. "If the method is compiled jump to its unchecked entry-point, otherwise interpret it." objectRepresentation genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: TempReg. self MoveR: TempReg R: ClassReg. jumpBCMethod := objectRepresentation genJumpSmallIntegerInScratchReg: TempReg. jumpBCMethod jmpTarget: interpretCall. self AddCq: cmNoCheckEntryOffset R: ClassReg. self JumpR: ClassReg. "First probe missed. Do second of three probes. Shift hash right one and retry." jumpSelectorMiss jmpTarget: (jumpClassMiss jmpTarget: self Label). self MoveR: SendNumArgsReg R: ClassReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. self LogicalShiftLeftCq: ShiftForWord - 1 R: ClassReg. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. self JumpZero: itsAHit. "Second probe missed. Do last probe. Shift hash right two and retry." jumpSelectorMiss jmpTarget: self Label. self MoveR: SendNumArgsReg R: ClassReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. ShiftForWord > 2 ifTrue: [self LogicalShiftLeftCq: ShiftForWord - 1 R: ClassReg]. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. self JumpZero: itsAHit. + "Last probe missed. Call ceSendFromInLineCacheMiss: to do the full lookup." - "Last probe missed. Call ceSendFromOpenPIC: to do the full lookup." jumpSelectorMiss jmpTarget: self Label. self genPushRegisterArgsForNumArgs: numArgs. self genSaveStackPointers. self genLoadCStackPointers. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: SendNumArgsReg)). cStackAlignment > BytesPerWord ifTrue: [backEnd genAlignCStackSavingRegisters: false numArgs: 1 wordAlignment: cStackAlignment / BytesPerWord]. backEnd genPassReg: SendNumArgsReg asArgument: 0. routine := self cCode: '(sqInt)ceSendFromInLineCacheMiss' inSmalltalk: [self simulatedAddressFor: #ceSendFromInLineCacheMiss:]. self annotateCall: (self Call: routine) "Note that this call does not return."! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSendTrampolineFor:numArgs:called:arg:arg:arg: (in category 'initialization') ----- genSendTrampolineFor: aRoutine numArgs: numArgs called: aString arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 + "Generate a trampoline with three arguments. - "Generate a trampoline with four arguments. Hack: a negative value indicates an abstract register, a non-negative value indicates a constant." <var: #aRoutine type: #'void *'> <var: #aString type: #'char *'> | startAddress | <inline: false> startAddress := methodZoneBase. opcodeIndex := 0. self genPushRegisterArgsForNumArgs: numArgs. self genTrampolineFor: aRoutine called: aString callJumpBar: true numArgs: 3 arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: nil saveRegs: false resultReg: nil appendOpcodes: true. ^startAddress! Item was changed: ----- Method: StackToRegisterMappingCogit>>numRegArgs (in category 'compile abstract instructions') ----- numRegArgs <api> - "Use of the macro allows the compiler to avoid the call and test in cointerpreter.c" - <cmacro: '() 1'> ^1!

1 0

VM Maker: VMMaker.oscog-eem.549.mcz
by commits＠source.squeak.org 09 Dec '13

09 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.549.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.549 Author: eem Time: 8 December 2013, 3:42:35.391 pm UUID: d2a4f1c3-8b11-4e93-9ad1-3e3ab35bbddd Ancestors: VMMaker.oscog-eem.548 Fix allocateSlots:format:classIndex: to not chew into the interpreter reserve. That's only for allocateNewSpaceSlots:format:classIndex:. Fix enumeration of newSpace objects to be in addfressSpace order, survivor space first, eden second. This allows printObjectsFrom:to: to determine the start of a newSpace object correctly. Fix the store check on SpurMemMgr>>clone:. Add cmUsesMethodClass flag and use it to reduce use of followForwardedLiteralsIn: in CoInterpreter's followNecessaryForwardingInMethod:. Make makeBaseFrameFor: call followNecessaryForwardingInMethod:. Add StackToRegisterMapping2RegArgsCogit although it is decidedly non-functional at the moment. =============== Diff against VMMaker.oscog-eem.548 =============== Item was added: + ----- Method: CoInterpreter>>followNecessaryForwardingInMethod: (in category 'lazy become') ----- + followNecessaryForwardingInMethod: methodObj + "To avoid any chance of a forwarded object during super sends we follow the + methodClassAssociation. The forwarded object send fault only copes with + normal sends to instances." + | cogMethod header | + <var: #cogMethod type: #'CogMethod *'> + super followNecessaryForwardingInMethod: methodObj. + header := self rawHeaderOf: methodObj. + (self isCogMethodReference: header) ifTrue: + [cogMethod := self cCoerceSimple: header to: #'CogMethod *'. + cogMethod cmUsesMethodClass ifTrue: + [cogit followForwardedLiteralsIn: cogMethod]]! Item was changed: ----- Method: CoInterpreter>>makeBaseFrameFor: (in category 'frame access') ----- makeBaseFrameFor: aContext "<Integer>" "Marry aContext with the base frame of a new stack page. Build the base frame to reflect the context's state. Answer the new page. Override to hold the caller context in a different place, In the StackInterpreter we use the caller saved ip, but in the Cog VM caller saved ip is the ceBaseReturn: trampoline. Simply hold the caller context in the first word of the stack." <returnTypeC: #'StackPage *'> | page pointer theMethod theIP numArgs stackPtrIndex maybeClosure rcvr | <inline: false> <var: #page type: #'StackPage *'> <var: #pointer type: #'char *'> <var: #cogMethod type: #'CogMethod *'> "theIP must be typed as signed because it is assigned ceCannotResumePC and so maybe implicitly typed as unsigned." <var: #theIP type: #sqInt> self assert: (self isSingleContext: aContext). self assert: (objectMemory goodContextSize: aContext). theIP := objectMemory fetchPointer: InstructionPointerIndex ofObject: aContext. self assert: HasBeenReturnedFromMCPC signedIntFromLong < 0. theIP := (objectMemory isIntegerObject: theIP) ifTrue: [objectMemory integerValueOf: theIP] ifFalse: [HasBeenReturnedFromMCPC]. theMethod := objectMemory followNonImmediateField: MethodIndex ofObject: aContext. + self followNecessaryForwardingInMethod: theMethod. page := self newStackPage. "first word on stack is caller context of base frame" stackPages longAt: (pointer := page baseAddress) put: (objectMemory fetchPointer: SenderIndex ofObject: aContext). "second word is the context itself; needed for cannotReturn processing; see ceBaseReturn:." stackPages longAt: (pointer := pointer - BytesPerWord) put: aContext. rcvr := objectMemory followField: ReceiverIndex ofObject: aContext. "If the frame is a closure activation then the closure should be on the stack in the pushed receiver position (closures receiver the value[:value:] messages). Otherwise it should be the receiver proper." maybeClosure := objectMemory fetchPointer: ClosureIndex ofObject: aContext. maybeClosure ~= objectMemory nilObject ifTrue: [numArgs := self argumentCountOfClosure: maybeClosure. stackPages longAt: (pointer := pointer - BytesPerWord) put: maybeClosure] ifFalse: [| header | header := self headerOf: theMethod. numArgs := self argumentCountOfMethodHeader: header. self cppIf: MULTIPLEBYTECODESETS ifTrue: "If this is a synthetic context its IP could be pointing at the CallPrimitive opcode. If so, skip it." [(theIP signedIntFromLong > 0 and: [(self methodHeaderHasPrimitive: header) and: [theIP = (1 + (objectMemory lastPointerOf: theMethod))]]) ifTrue: [theIP := theIP + (self sizeOfCallPrimitiveBytecode: header)]]. stackPages longAt: (pointer := pointer - BytesPerWord) put: rcvr]. "Put the arguments on the stack" 1 to: numArgs do: [:i| stackPages longAt: (pointer := pointer - BytesPerWord) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "saved caller ip is base return trampoline" stackPages longAt: (pointer := pointer - BytesPerWord) put: cogit ceBaseFrameReturnPC. "base frame's saved fp is null" stackPages longAt: (pointer := pointer - BytesPerWord) put: 0. "N.B. Don't set the baseFP, which marks the page as in use, until after ensureMethodIsCogged: and/or instructionPointer:forContext:frame:. These can cause a compiled code compaction which, if marked as in use, will examine this partially initialized page and crash." page headFP: pointer. "Create either a machine code frame or an interpreter frame based on the pc. If the pc is -ve it is a machine code pc and so we produce a machine code frame. If +ve an interpreter frame. N.B. Do *not* change this to try and map from a bytecode pc to a machine code frame under any circumstances. See ensureContextIsExecutionSafeAfterAssignToStackPointer:" theIP signedIntFromLong < 0 ifTrue: [| cogMethod | "Since we would have to generate a machine-code method to be able to map the native pc anyway we should create a native method and native frame." cogMethod := self ensureMethodIsCogged: theMethod. theMethod := cogMethod asInteger. maybeClosure ~= objectMemory nilObject ifTrue: ["If the pc is the special HasBeenReturnedFromMCPC pc set the pc appropriately so that the frame stays in the cannotReturn: state." theIP = HasBeenReturnedFromMCPC signedIntFromLong ifTrue: [theMethod := (cogit findMethodForStartBcpc: (self startPCOfClosure: maybeClosure) inHomeMethod: (self cCoerceSimple: theMethod to: #'CogMethod *')) asInteger. theMethod = 0 ifTrue: [self error: 'cannot find machine code block matching closure''s startpc']. theIP := cogit ceCannotResumePC] ifFalse: [self assert: (theIP signedBitShift: -16) < -1. "See contextInstructionPointer:frame:" theMethod := theMethod - ((theIP signedBitShift: -16) * cogit blockAlignment). theIP := theMethod - theIP signedIntFromShort]. stackPages longAt: (pointer := pointer - BytesPerWord) put: theMethod + MFMethodFlagHasContextFlag + MFMethodFlagIsBlockFlag] ifFalse: [self assert: (theIP signedBitShift: -16) >= -1. "If the pc is the special HasBeenReturnedFromMCPC pc set the pc appropriately so that the frame stays in the cannotReturn: state." theIP := theIP = HasBeenReturnedFromMCPC signedIntFromLong ifTrue: [cogit ceCannotResumePC] ifFalse: [theMethod asInteger - theIP]. stackPages longAt: (pointer := pointer - BytesPerWord) put: theMethod + MFMethodFlagHasContextFlag]. stackPages longAt: (pointer := pointer - BytesPerWord) put: aContext] ifFalse: [stackPages longAt: (pointer := pointer - BytesPerWord) put: theMethod. stackPages longAt: (pointer := pointer - BytesPerWord) put: aContext. stackPages longAt: (pointer := pointer - BytesPerWord) put: (self encodeFrameFieldHasContext: true isBlock: maybeClosure ~= objectMemory nilObject numArgs: numArgs). stackPages longAt: (pointer := pointer - BytesPerWord) put: 0. "FoxIFSavedIP" theIP := self iframeInstructionPointerForIndex: theIP method: theMethod]. page baseFP: page headFP. self assert: (self frameHasContext: page baseFP). self assert: (self frameNumArgs: page baseFP) == numArgs. stackPages longAt: (pointer := pointer - BytesPerWord) put: rcvr. stackPtrIndex := self quickFetchInteger: StackPointerIndex ofObject: aContext. self assert: ReceiverIndex + stackPtrIndex < (objectMemory lengthOf: aContext). numArgs + 1 to: stackPtrIndex do: [:i| stackPages longAt: (pointer := pointer - BytesPerWord) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "top of stack is the instruction pointer" stackPages longAt: (pointer := pointer - BytesPerWord) put: theIP. page headSP: pointer. self assert: (self context: aContext hasValidInversePCMappingOf: theIP in: page baseFP). "Mark context as married by setting its sender to the frame pointer plus SmallInteger tags and the InstructionPointer to the saved fp (which ensures correct alignment w.r.t. the frame when we check for validity) plus SmallInteger tags." objectMemory storePointerUnchecked: SenderIndex ofObject: aContext withValue: (self withSmallIntegerTags: page baseFP). objectMemory storePointerUnchecked: InstructionPointerIndex ofObject: aContext withValue: (self withSmallIntegerTags: 0). self assert: (objectMemory isIntegerObject: (objectMemory fetchPointer: SenderIndex ofObject: aContext)). self assert: (self frameOfMarriedContext: aContext) = page baseFP. self assert: (self validStackPageBaseFrame: page). ^page! Item was changed: VMStructType subclass: #CogBlockMethod + instanceVariableNames: 'objectHeader homeOffset startpc padToWord cmNumArgs cmType cmRefersToYoung cpicHasMNUCase cmUsageCount cmUsesPenultimateLit cmUsesMethodClass cmUnusedFlags stackCheckOffset' - instanceVariableNames: 'objectHeader homeOffset startpc padToWord cmNumArgs cmType cmRefersToYoung cpicHasMNUCase cmUsageCount cmUsesPenultimateLit cmUnusedFlags stackCheckOffset' classVariableNames: '' poolDictionaries: 'CogMethodConstants VMBasicConstants' category: 'VMMaker-JIT'! !CogBlockMethod commentStamp: 'eem 1/9/2011 08:41' prior: 0! I am the rump method header for a block method embedded in a full CogMethod. I am the superclass of CogMethod, which is a Cog method header proper. Instances of both classes have the same second word. The homeOffset abd startpc fields are overlaid on the objectHeader in a CogMethod. In C I look like typedef struct { unsigned short homeOffset; unsigned short startpc; unsigned cmNumArgs : 8; unsigned cmType : 3; unsigned cmRefersToYoung : 1; unsigned cmIsUnlinked : 1; unsigned cmUsageCount : 3; unsigned stackCheckOffset : 16; } CogBlockMethod; My instances are not actually used. The methods exist only as input to Slang. The simulator uses my surrogates (CogBlockMethodSurrogate32 and CogBlockMethodSurrogate64.! Item was changed: ----- Method: CogBlockMethod class>>instVarNamesAndTypesForTranslationDo: (in category 'translation') ----- instVarNamesAndTypesForTranslationDo: aBinaryBlock "enumerate aBinaryBlock with the names and C type strings for the inst vars to include in a CogMethod or CogBlockMethod struct." self allInstVarNames do: [:ivn| "Notionally objectHeader is in a union with homeOffset and startpc but we don't have any convenient support for unions. So hack, hack, hack, hack." ((self == CogBlockMethod ifTrue: [#('objectHeader')] ifFalse: [#('homeOffset' 'startpc' 'padToWord')]) includes: ivn) ifFalse: [aBinaryBlock value: ivn value: (ivn caseOf: { ['objectHeader'] -> [self objectMemoryClass baseHeaderSize = 8 ifTrue: [#sqLong] ifFalse: [#sqInt]]. ['cmNumArgs'] -> [#(unsigned ' : 8')]. "SqueakV3 needs only 5 bits" ['cmType'] -> [#(unsigned ' : 3')]. ['cmRefersToYoung'] -> [#(unsigned #Boolean ' : 1')]. ['cpicHasMNUCase'] -> [#(unsigned #Boolean ' : 1')]. ['cmUsageCount'] -> [#(unsigned ' : 3')]. "see CMMaxUsageCount in initialize" ['cmUsesPenultimateLit'] -> [#(unsigned #Boolean ' : 1')]. + ['cmUsesMethodClass'] -> [#(unsigned #Boolean ' : 1')]. + ['cmUnusedFlags'] -> [#(unsigned ' : 2')]. - ['cmUnusedFlags'] -> [#(unsigned ' : 3')]. ['stackCheckOffset'] -> [#(unsigned ' : 12')]. "See MaxStackCheckOffset in initialize. a.k.a. cPICNumCases" ['blockSize'] -> [#'unsigned short']. "See MaxMethodSize in initialize" ['blockEntryOffset'] -> [#'unsigned short']. ['homeOffset'] -> [#'unsigned short']. ['startpc'] -> [#'unsigned short']. ['padToWord'] -> [#(#BaseHeaderSize 8 'unsigned int')]. ['nextMethod'] -> ['struct _CogMethod *']} "see NewspeakCogMethod" otherwise: [#sqInt])]]! Item was added: + ----- Method: CogBlockMethod>>cmUsesMethodClass (in category 'accessing') ----- + cmUsesMethodClass + "Answer the value of cmUsesMethodClass" + + ^cmUsesMethodClass! Item was added: + ----- Method: CogBlockMethod>>cmUsesMethodClass: (in category 'accessing') ----- + cmUsesMethodClass: anObject + "Set the value of cmUsesMethodClass" + + ^cmUsesMethodClass := anObject! Item was added: + ----- Method: CogBlockMethodSurrogate32>>cmUsesMethodClass (in category 'accessing') ----- + cmUsesMethodClass + ^(((memory unsignedByteAt: address + 3 + baseHeaderSize) bitShift: -1) bitAnd: 16r1) ~= 0! Item was added: + ----- Method: CogBlockMethodSurrogate32>>cmUsesMethodClass: (in category 'accessing') ----- + cmUsesMethodClass: aValue + memory + unsignedByteAt: address + baseHeaderSize + 3 + put: (((memory unsignedByteAt: address + baseHeaderSize + 3) bitAnd: 16rFD) + ((aValue ifTrue: [1] ifFalse: [0]) bitShift: 1)). + ^aValue! Item was added: + ----- Method: CogBlockMethodSurrogate64>>cmUsesMethodClass (in category 'accessing') ----- + cmUsesMethodClass + ^(((memory unsignedByteAt: address + 3 + baseHeaderSize) bitShift: -1) bitAnd: 16r1) ~= 0! Item was added: + ----- Method: CogBlockMethodSurrogate64>>cmUsesMethodClass: (in category 'accessing') ----- + cmUsesMethodClass: aValue + memory + unsignedByteAt: address + baseHeaderSize + 3 + put: (((memory unsignedByteAt: address + baseHeaderSize + 3) bitAnd: 16rFD) + ((aValue ifTrue: [1] ifFalse: [0]) bitShift: 1)). + ^aValue! Item was added: + ----- Method: CogMethodSurrogate32>>cmUsesMethodClass (in category 'accessing') ----- + cmUsesMethodClass + ^(((memory unsignedByteAt: address + 3 + baseHeaderSize) bitShift: -1) bitAnd: 16r1) ~= 0! Item was added: + ----- Method: CogMethodSurrogate32>>cmUsesMethodClass: (in category 'accessing') ----- + cmUsesMethodClass: aValue + memory + unsignedByteAt: address + baseHeaderSize + 3 + put: (((memory unsignedByteAt: address + baseHeaderSize + 3) bitAnd: 16rFD) + ((aValue ifTrue: [1] ifFalse: [0]) bitShift: 1)). + ^aValue! Item was added: + ----- Method: CogMethodSurrogate64>>cmUsesMethodClass (in category 'accessing') ----- + cmUsesMethodClass + ^(((memory unsignedByteAt: address + 3 + baseHeaderSize) bitShift: -1) bitAnd: 16r1) ~= 0! Item was added: + ----- Method: CogMethodSurrogate64>>cmUsesMethodClass: (in category 'accessing') ----- + cmUsesMethodClass: aValue + memory + unsignedByteAt: address + baseHeaderSize + 3 + put: (((memory unsignedByteAt: address + baseHeaderSize + 3) bitAnd: 16rFD) + ((aValue ifTrue: [1] ifFalse: [0]) bitShift: 1)). + ^aValue! Item was changed: CogClass subclass: #Cogit + instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent usesMethodClass primitiveIndex backEnd postCompileHook primInvokeLabel methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMissCall missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry dynSuperEntry dynSuperEntryAlignment cmDynSuperEntryOffset mnuCall interpretCall endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes annotations generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes annotationIndex blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxMethodBefore maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceClosureCopyTrampoline ceCreateNewArrayTrampoline ceEnterCogCodePopReceiverReg ceEnterCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceActiveContextTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline cePositive32BitIntegerTrampoline ceImplicitReceiverTrampoline ceExplicitReceiverTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCEEnterCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB' - instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd postCompileHook primInvokeLabel methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMissCall missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry dynSuperEntry dynSuperEntryAlignment cmDynSuperEntryOffset mnuCall interpretCall endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes annotations generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes annotationIndex blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxMethodBefore maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceClosureCopyTrampoline ceCreateNewArrayTrampoline ceEnterCogCodePopReceiverReg ceEnterCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceActiveContextTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline cePositive32BitIntegerTrampoline ceImplicitReceiverTrampoline ceExplicitReceiverTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCEEnterCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB' classVariableNames: 'AltBlockCreationBytecodeSize AltNSSendIsPCAnnotated AnnotationConstantNames AnnotationShift BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration EncounteredUnknownBytecode FirstAnnotation HasBytecodePC InsufficientCodeSpace IsAbsPCReference IsDisplacement IsDisplacementX2N IsNSSendCall IsObjectReference IsRelativeCall IsSendCall MapEnd MaxCompiledPrimitiveIndex MaxNegativeErrorCode MaxStackAllocSize MaxUnitDisplacement MaxX2NDisplacement MethodTooBig NSSendIsPCAnnotated NotFullyInitialized NumObjRefsInRuntime NumSendTrampolines NumTrampolines ProcessorClass UnimplementedPrimitive YoungSelectorInPIC' poolDictionaries: 'CogCompilationConstants CogMethodConstants CogRTLOpcodes VMBasicConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! !Cogit commentStamp: 'eem 2/13/2013 15:37' prior: 0! I am the code generator for the Cog VM. My job is to produce machine code versions of methods for faster execution and to manage inline caches for faster send performance. I can be tested in the current image using my class-side in-image compilation facilities. e.g. try StackToRegisterMappingCogit genAndDis: (Integer >> #benchFib) I have concrete subclasses that implement different levels of optimization: SimpleStackBasedCogit is the simplest code generator. StackToRegisterMappingCogit is the current production code generator It defers pushing operands to the stack until necessary and implements a register-based calling convention for low-arity sends. StackToRegisterMappingCogit is an experimental code generator with support for counting conditional branches, intended to support adaptive optimization. coInterpreter <CoInterpreterSimulator> the VM's interpreter with which I cooperate methodZoneManager <CogMethodZoneManager> the manager of the machine code zone objectRepresentation <CogObjectRepresentation> the object used to generate object accesses processor <BochsIA32Alien|?> the simulator that executes the IA32/x86 machine code I generate when simulating execution in Smalltalk simulatedTrampolines <Dictionary of Integer -> MessageSend> the dictionary mapping trap jump addresses to run-time routines used to warp from simulated machine code in to the Smalltalk run-time. simulatedVariableGetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap read addresses to variables in run-time objects used to allow simulated machine code to read variables in the Smalltalk run-time. simulatedVariableSetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap write addresses to variables in run-time objects used to allow simulated machine code to write variables in the Smalltalk run-time. printRegisters printInstructions clickConfirm <Boolean> flags controlling debug printing and code simulation breakPC <Integer> machine code pc breakpoint cFramePointer cStackPointer <Integer> the variables representing the C stack & frame pointers, which must change on FFI callback and return selectorOop <sqInt> the oop of the methodObj being compiled methodObj <sqInt> the bytecode method being compiled initialPC endPC <Integer> the start and end pcs of the methodObj being compiled methodOrBlockNumArgs <Integer> argument count of current method or block being compiled needsFrame <Boolean> whether methodObj or block needs a frame to execute primitiveIndex <Integer> primitive index of current method being compiled methodLabel <CogAbstractOpcode> label for the method header blockEntryLabel <CogAbstractOpcode> label for the start of the block dispatch code stackOverflowCall <CogAbstractOpcode> label for the call of ceStackOverflow in the method prolog sendMissCall <CogAbstractOpcode> label for the call of ceSICMiss in the method prolog entryOffset <Integer> offset of method entry code from start (header) of method entry <CogAbstractOpcode> label for the first instruction of the method entry code noCheckEntryOffset <Integer> offset of the start of a method proper (after the method entry code) from start (header) of method noCheckEntry <CogAbstractOpcode> label for the first instruction of start of a method proper fixups <Array of <AbstractOpcode Label | nil>> the labels for forward jumps that will be fixed up when reaching the relevant bytecode. fixup shas one element per byte in methodObj's bytecode abstractOpcodes <Array of <AbstractOpcode>> the code generated when compiling methodObj byte0 byte1 byte2 byte3 <Integer> individual bytes of current bytecode being compiled in methodObj bytecodePointer <Integer> bytecode pc (same as Smalltalk) of the current bytecode being compiled opcodeIndex <Integer> the index of the next free entry in abstractOpcodes (this code is translated into C where OrderedCollection et al do not exist) numAbstractOpcodes <Integer> the number of elements in abstractOpcocdes blockStarts <Array of <BlockStart>> the starts of blocks in the current method blockCount the index into blockStarts as they are being noted, and hence eventuakly teh total number of blocks in the current method labelCounter <Integer> a nicety for numbering labels not needed in the production system but probably not expensive enough to worry about ceStackOverflowTrampoline <Integer> ceSend0ArgsTrampoline <Integer> ceSend1ArgsTrampoline <Integer> ceSend2ArgsTrampoline <Integer> ceSendNArgsTrampoline <Integer> ceSendSuper0ArgsTrampoline <Integer> ceSendSuper1ArgsTrampoline <Integer> ceSendSuper2ArgsTrampoline <Integer> ceSendSuperNArgsTrampoline <Integer> ceSICMissTrampoline <Integer> ceCPICMissTrampoline <Integer> ceStoreCheckTrampoline <Integer> ceReturnToInterpreterTrampoline <Integer> ceBaseFrameReturnTrampoline <Integer> ceSendMustBeBooleanTrampoline <Integer> ceClosureCopyTrampoline <Integer> the various trampolines (system-call-like jumps from machine code to the run-time). See Cogit>>generateTrampolines for the mapping from trampoline to run-time routine and then read the run-time routine for a funcitonal description. ceEnterCogCodePopReceiverReg <Integer> the enilopmart (jump from run-time to machine-code) methodZoneBase <Integer> ! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! Item was changed: ----- Method: Cogit>>compileCogMethod: (in category 'compile abstract instructions') ----- compileCogMethod: selector <returnTypeC: #'CogMethod *'> | numBytecodes numBlocks numCleanBlocks result extra | hasYoungReferent := (objectMemory isYoungObject: methodObj) or: [objectMemory isYoung: selector]. methodOrBlockNumArgs := coInterpreter argumentCountOf: methodObj. inBlock := false. primInvokeLabel := nil. postCompileHook := nil. maxLitIndex := -1. + usesMethodClass := false. extra := ((primitiveIndex := coInterpreter primitiveIndexOf: methodObj) > 0 and: [(coInterpreter isQuickPrimitiveIndex: primitiveIndex) not]) ifTrue: [30] ifFalse: [10]. initialPC := coInterpreter startPCOfMethod: methodObj. "initial estimate. Actual endPC is determined in scanMethod." endPC := (coInterpreter isQuickPrimitiveIndex: primitiveIndex) ifTrue: [initialPC - 1] ifFalse: [objectMemory byteLengthOf: methodObj]. numBytecodes := endPC - initialPC + 1. self allocateOpcodes: (numBytecodes + extra) * 10 bytecodes: numBytecodes ifFail: [^coInterpreter cCoerceSimple: MethodTooBig to: #'CogMethod *']. (numBlocks := self scanMethod) < 0 ifTrue: [^coInterpreter cCoerceSimple: numBlocks to: #'CogMethod *']. numCleanBlocks := self scanForCleanBlocks. self allocateBlockStarts: numBlocks + numCleanBlocks. blockCount := 0. numCleanBlocks > 0 ifTrue: [self addCleanBlockStarts]. self maybeAllocAndInitCounters. blockEntryLabel := nil. methodLabel dependent: nil. (result := self compileEntireMethod) < 0 ifTrue: [^coInterpreter cCoerceSimple: result to: #'CogMethod *']. ^self generateCogMethod: selector! Item was changed: ----- Method: Cogit>>fillInMethodHeader:size:selector: (in category 'generate machine code') ----- fillInMethodHeader: method size: size selector: selector <returnTypeC: #'CogMethod *'> <var: #method type: #'CogMethod *'> <var: #originalMethod type: #'CogMethod *'> | methodHeader originalMethod | method cmType: CMMethod. method objectHeader: objectMemory nullHeaderForMachineCodeMethod. method blockSize: size. method methodObject: methodObj. methodHeader := coInterpreter rawHeaderOf: methodObj. "If the method has already been cogged (e.g. Newspeak accessors) then leave the original method attached to its cog method, but get the right header." (coInterpreter isCogMethodReference: methodHeader) ifTrue: [originalMethod := self cCoerceSimple: methodHeader to: #'CogMethod *'. self assert: originalMethod blockSize = size. methodHeader := originalMethod methodHeader. self cppIf: NewspeakVM ifTrue: [methodZone addToUnpairedMethodList: method]] ifFalse: [coInterpreter rawHeaderOf: methodObj put: method asInteger]. method methodHeader: methodHeader. method selector: selector. method cmNumArgs: (coInterpreter argumentCountOfMethodHeader: methodHeader). (method cmRefersToYoung: hasYoungReferent) ifTrue: [methodZone addToYoungReferrers: method]. method cmUsageCount: self initialMethodUsageCount. method cpicHasMNUCase: false. method cmUsesPenultimateLit: maxLitIndex >= ((coInterpreter literalCountOfHeader: methodHeader) - 2). + method cmUsesMethodClass: usesMethodClass. method blockEntryOffset: (blockEntryLabel notNil ifTrue: [blockEntryLabel address - method asInteger] ifFalse: [0]). "This can be an error check since a large stackCheckOffset is caused by compiling a machine-code primitive, and hence depends on the Cogit, not the input method." needsFrame ifTrue: [stackCheckLabel address - method asInteger <= MaxStackCheckOffset ifFalse: [self error: 'too much code for stack check offset']]. method stackCheckOffset: (needsFrame ifTrue: [stackCheckLabel address - method asInteger] ifFalse: [0]). self assert: (backEnd callTargetFromReturnAddress: method asInteger + missOffset) = (self methodAbortTrampolineFor: method cmNumArgs). self assert: size = (methodZone roundUpLength: size). ^method! Item was changed: ----- Method: NewObjectMemory>>printObjectsFrom:to: (in category 'debug printing') ----- printObjectsFrom: startAddress to: endAddress <api> | oop | oop := startAddress. + [self oop: oop isLessThan: endAddress] whileTrue: - [oop < endAddress] whileTrue: [(self isFreeObject: oop) ifFalse: [self printOop: oop]. oop := self objectAfter: oop].! Item was changed: ----- Method: SimpleStackBasedCogit>>genSendDynamicSuper:numArgs: (in category 'bytecode generators') ----- genSendDynamicSuper: selector numArgs: numArgs (objectMemory isYoung: selector) ifTrue: [hasYoungReferent := true]. self assert: needsFrame. self MoveMw: numArgs * BytesPerWord r: SPReg R: ReceiverResultReg. numArgs > 2 ifTrue: [self MoveCq: numArgs R: SendNumArgsReg]. self MoveCw: selector R: ClassReg. self CallNewspeakSend: (dynamicSuperSendTrampolines at: (numArgs min: NumSendTrampolines - 1)). + usesMethodClass := true. self flag: 'currently caller pushes result'. self PushR: ReceiverResultReg. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genSendSuper:numArgs: (in category 'bytecode generators') ----- genSendSuper: selector numArgs: numArgs <inline: false> self assert: needsFrame. self assert: (numArgs between: 0 and: 256). "say" self assert: (objectMemory addressCouldBeOop: selector). (objectMemory isYoung: selector) ifTrue: [hasYoungReferent := true]. self MoveMw: numArgs * BytesPerWord r: SPReg R: ReceiverResultReg. numArgs > 2 ifTrue: [self MoveCq: numArgs R: SendNumArgsReg]. self MoveCw: selector R: ClassReg. self CallSend: (superSendTrampolines at: (numArgs min: NumSendTrampolines - 1)). + usesMethodClass := true. self flag: 'currently caller pushes result'. self PushR: ReceiverResultReg. ^0! Item was changed: ----- Method: Spur32BitMemoryManager>>allocateNewSpaceSlots:format:classIndex: (in category 'allocation') ----- allocateNewSpaceSlots: numSlots format: formatField classIndex: classIndex "Allocate an object with numSlots in newSpace. This is for the `ee' execution engine allocations, + and must be satisfied. If no memory is available, abort. If the allocation pushes freeStart past + scavengeThreshold and a scavenge is not already scheduled, schedule a scavenge." - and must be satisfied. If no memory is available, abort." | numBytes newObj | "Object headers are 8 bytes in length if the slot size fits in the num slots field (max implies overflow), 16 bytes otherwise (num slots in preceeding word). Objects always have at least one slot, for the forwarding pointer, and are multiples of 8 bytes in length." numSlots >= self numSlotsMask ifTrue: [newObj := freeStart + self baseHeaderSize. numBytes := self baseHeaderSize + self baseHeaderSize "double header" + (numSlots + (numSlots bitAnd: 1) * self bytesPerSlot)] "roundTo allocationUnit" ifFalse: [newObj := freeStart. numBytes := self baseHeaderSize "single header" + (numSlots <= 1 ifTrue: [self allocationUnit] "at least one slot for the forwarding pointer" ifFalse: [numSlots + (numSlots bitAnd: 1) * self bytesPerSlot])]. "roundTo allocationUnit" freeStart + numBytes > scavengeThreshold ifTrue: [needGCFlag ifFalse: [self scheduleScavenge]. freeStart + numBytes > scavenger eden limit ifTrue: [self error: 'no room in eden for allocateNewSpaceSlots:format:classIndex:'. ^0]]. numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word" [self flag: #endianness. self longAt: freeStart put: numSlots. self longAt: freeStart + 4 put: self numSlotsMask << self numSlotsHalfShift. self longLongAt: newObj put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex)] ifFalse: [self longLongAt: newObj put: (self headerForSlots: numSlots format: formatField classIndex: classIndex)]. self assert: numBytes \\ self allocationUnit = 0. self assert: newObj \\ self allocationUnit = 0. freeStart := freeStart + numBytes. ^newObj! Item was changed: ----- Method: Spur32BitMemoryManager>>allocateSlots:format:classIndex: (in category 'allocation') ----- allocateSlots: numSlots format: formatField classIndex: classIndex + "Allocate an object with numSlots space. If there is room beneath scavengeThreshold + allocate in newSpace, otherwise alocate in oldSpace. If there is not room in newSpace + and a scavenge is not already scheduled, schedule a scavenge." <inline: true> | numBytes newObj | "Object headers are 8 bytes in length if the slot size fits in the num slots field (max implies overflow), 16 bytes otherwise (num slots in preceeding word). Objects always have at least one slot, for the forwarding pointer, and are multiples of 8 bytes in length." numSlots >= self numSlotsMask ifTrue: [newObj := freeStart + self baseHeaderSize. numBytes := self baseHeaderSize + self baseHeaderSize "double header" + (numSlots + (numSlots bitAnd: 1) * self bytesPerSlot)] "roundTo allocationUnit" ifFalse: [newObj := freeStart. numBytes := self baseHeaderSize "single header" + (numSlots <= 1 ifTrue: [self allocationUnit] "at least one slot for the forwarding pointer" ifFalse: [numSlots + (numSlots bitAnd: 1) * self bytesPerSlot])]. "roundTo allocationUnit" freeStart + numBytes > scavengeThreshold ifTrue: [needGCFlag ifFalse: [self scheduleScavenge]. + ^self allocateSlotsInOldSpace: numSlots bytes: numBytes format: formatField classIndex: classIndex]. - freeStart + numBytes > scavenger eden limit ifTrue: - [^self allocateSlotsInOldSpace: numSlots bytes: numBytes format: formatField classIndex: classIndex]]. numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word" [self flag: #endianness. self longAt: freeStart put: numSlots. self longAt: freeStart + 4 put: self numSlotsMask << self numSlotsHalfShift. self longLongAt: newObj put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex)] ifFalse: [self longLongAt: newObj put: (self headerForSlots: numSlots format: formatField classIndex: classIndex)]. self assert: numBytes \\ self allocationUnit = 0. self assert: newObj \\ self allocationUnit = 0. freeStart := freeStart + numBytes. ^newObj! Item was changed: ----- Method: Spur64BitMemoryManager>>allocateNewSpaceSlots:format:classIndex: (in category 'allocation') ----- allocateNewSpaceSlots: numSlots format: formatField classIndex: classIndex "Allocate an object with numSlots in newSpace. This is for the `ee' execution engine allocations, + and must be satisfied. If no memory is available, abort. If the allocation pushes freeStart past + scavengeThreshold and a scavenge is not already scheduled, schedule a scavenge." - and must be satisfied. If no memory is available, abort." | numBytes newObj | "Object headers are 8 bytes in length if the slot size fits in the num slots field (max implies overflow), 16 bytes otherwise (num slots in preceeding word). Objects always have at least one slot, for the forwarding pointer, and are multiples of 8 bytes in length." numSlots >= self numSlotsMask ifTrue: [numSlots > 16rffffffff ifTrue: [^nil]. newObj := freeStart + self baseHeaderSize. numBytes := (self baseHeaderSize + self baseHeaderSize) "double header" + (numSlots * self bytesPerSlot)] ifFalse: [newObj := freeStart. numBytes := self baseHeaderSize "single header" + (numSlots < 1 ifTrue: [self allocationUnit] "at least one slot for the forwarding pointer" ifFalse: [numSlots * self bytesPerSlot])]. freeStart + numBytes > scavengeThreshold ifTrue: [needGCFlag ifFalse: [self scheduleScavenge]. freeStart + numBytes > scavenger eden limit ifTrue: [self error: 'no room in eden for allocateNewSpaceSlots:format:classIndex:'. ^0]]. numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word" [self flag: #endianness. self longAt: freeStart put: numSlots. self longAt: freeStart + 4 put: self numSlotsMask << self numSlotsHalfShift. self longLongAt: newObj put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex)] ifFalse: [self longLongAt: newObj put: (self headerForSlots: numSlots format: formatField classIndex: classIndex)]. self assert: numBytes \\ self allocationUnit = 0. self assert: newObj \\ self allocationUnit = 0. freeStart := freeStart + numBytes. ^newObj! Item was changed: ----- Method: Spur64BitMemoryManager>>allocateSlots:format:classIndex: (in category 'allocation') ----- allocateSlots: numSlots format: formatField classIndex: classIndex + "Allocate an object with numSlots space. If there is room beneath scavengeThreshold + allocate in newSpace, otherwise alocate in oldSpace. If there is not room in newSpace + and a scavenge is not already scheduled, schedule a scavenge." <inline: true> | numBytes newObj | "Object headers are 8 bytes in length if the slot size fits in the num slots field (max implies overflow), 16 bytes otherwise (num slots in preceeding word). Objects always have at least one slot, for the forwarding pointer, and are multiples of 8 bytes in length." numSlots >= self numSlotsMask ifTrue: [numSlots > 16rffffffff ifTrue: [^nil]. newObj := freeStart + self baseHeaderSize. numBytes := (self baseHeaderSize + self baseHeaderSize) "double header" + (numSlots * self bytesPerSlot)] ifFalse: [newObj := freeStart. numBytes := self baseHeaderSize "single header" + (numSlots < 1 ifTrue: [self allocationUnit] "at least one slot for the forwarding pointer" ifFalse: [numSlots * self bytesPerSlot])]. freeStart + numBytes > scavengeThreshold ifTrue: [needGCFlag ifFalse: [self scheduleScavenge]. + ^self allocateSlotsInOldSpace: numSlots bytes: numBytes format: formatField classIndex: classIndex]. - freeStart + numBytes > scavenger eden limit ifTrue: - [^self allocateSlotsInOldSpace: numSlots bytes: numBytes format: formatField classIndex: classIndex]]. numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word" [self flag: #endianness. self longAt: freeStart put: numSlots. self longAt: freeStart + 4 put: self numSlotsMask << self numSlotsHalfShift. self longLongAt: newObj put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex)] ifFalse: [self longLongAt: newObj put: (self headerForSlots: numSlots format: formatField classIndex: classIndex)]. self assert: numBytes \\ self allocationUnit = 0. self assert: newObj \\ self allocationUnit = 0. freeStart := freeStart + numBytes. ^newObj! Item was changed: ----- Method: SpurMemoryManager>>allNewSpaceEntitiesDo: (in category 'object enumeration') ----- allNewSpaceEntitiesDo: aBlock "Enumerate all new space objects, including free objects." <inline: true> | prevObj prevPrevObj objOop limit | prevPrevObj := prevObj := nil. "After a scavenge eden is empty, futureSpace is empty, and all newSpace objects are + in pastSpace. Objects are allocated in eden. So enumerate only pastSpace and eden." + self assert: scavenger pastSpace start < scavenger eden start. - in pastSpace. Objects are allocated in eden. So enumerate only eden and pastSpace." - objOop := self objectStartingAt: scavenger eden start. - [self oop: objOop isLessThan: freeStart] whileTrue: - [aBlock value: objOop. - prevPrevObj := prevObj. - prevObj := objOop. - objOop := self objectAfter: objOop limit: freeStart]. objOop := self objectStartingAt: scavenger pastSpace start. limit := pastSpaceStart. [self oop: objOop isLessThan: limit] whileTrue: [aBlock value: objOop. prevPrevObj := prevObj. prevObj := objOop. objOop := self objectAfter: objOop limit: limit]. + objOop := self objectStartingAt: scavenger eden start. + [self oop: objOop isLessThan: freeStart] whileTrue: + [aBlock value: objOop. + prevPrevObj := prevObj. + prevObj := objOop. + objOop := self objectAfter: objOop limit: freeStart]. self touch: prevPrevObj. self touch: prevObj! Item was changed: ----- Method: SpurMemoryManager>>allocateNewSpaceSlots:format:classIndex: (in category 'allocation') ----- allocateNewSpaceSlots: numSlots format: formatField classIndex: classIndex + "Allocate an object with numSlots in newSpace. This is for the `ee' execution engine allocations, + and must be satisfied. If no memory is available, abort. If the allocation pushes freeStart past + scavengeThreshold and a scavenge is not already scheduled, schedule a scavenge." self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>allocateSlots:format:classIndex: (in category 'allocation') ----- allocateSlots: numSlots format: formatField classIndex: classIndex + "Allocate an object with numSlots space. If there is room beneath scavengeThreshold + allocate in newSpace, otherwise alocate in oldSpace. If there is not room in newSpace + and a scavenge is not already scheduled, schedule a scavenge." self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>clone: (in category 'allocation') ----- clone: objOop | numSlots newObj | numSlots := self numSlotsOf: objOop. numSlots > self maxSlotsForNewSpaceAlloc ifTrue: [newObj := self allocateSlotsInOldSpace: numSlots format: (self formatOf: objOop) classIndex: (self classIndexOf: objOop)] ifFalse: [newObj := self allocateSlots: numSlots format: (self formatOf: objOop) classIndex: (self classIndexOf: objOop)]. (self isPointersNonImm: objOop) ifTrue: + [| hasYoung | + hasYoung := false. + 0 to: numSlots - 1 do: - [0 to: numSlots - 1 do: [:i| | oop | oop := self fetchPointer: i ofObject: objOop. ((self isNonImmediate: oop) and: [self isForwarded: oop]) ifTrue: [oop := self followForwarded: oop]. + ((self isNonImmediate: oop) + and: [self isYoungObject: oop]) ifTrue: + [hasYoung := true]. self storePointerUnchecked: i ofObject: newObj withValue: oop]. + (hasYoung - ((self isRemembered: objOop) and: [(self isYoungObject: newObj) not]) ifTrue: [scavenger remember: newObj. self setIsRememberedOf: newObj to: true]] ifFalse: [0 to: numSlots - 1 do: [:i| self storePointerUnchecked: i ofObject: newObj withValue: (self fetchPointer: i ofObject: objOop)]]. ^newObj! Item was added: + ----- Method: SpurMemoryManager>>printObjectsFrom:to: (in category 'debug printing') ----- + printObjectsFrom: startAddress to: endAddress + <api> + | oop | + oop := self objectBefore: startAddress. + oop := oop + ifNil: [startAddress] + ifNotNil: [(self objectAfter: oop) = startAddress + ifTrue: [startAddress] + ifFalse: [oop]]. + [self oop: oop isLessThan: endAddress] whileTrue: + [(self isFreeObject: oop) ifFalse: + [self printOop: oop]. + oop := self objectAfter: oop]! Item was added: + ----- Method: SpurMemoryManager>>shortPrintObjectsFrom:to: (in category 'debug printing') ----- + shortPrintObjectsFrom: startAddress to: endAddress + <api> + | oop | + oop := self objectBefore: startAddress. + oop := oop + ifNil: [startAddress] + ifNotNil: [(self objectAfter: oop) = startAddress + ifTrue: [startAddress] + ifFalse: [oop]]. + [self oop: oop isLessThan: endAddress] whileTrue: + [(self isFreeObject: oop) ifFalse: + [self shortPrintOop: oop]. + oop := self objectAfter: oop]! Item was changed: ----- Method: StackInterpreter>>makeBaseFrameFor: (in category 'frame access') ----- makeBaseFrameFor: aContext "<Integer>" "Marry aContext with the base frame of a new stack page. Build the base frame to reflect the context's state. Answer the new page." <returnTypeC: #'StackPage *'> | page pointer theMethod theIP numArgs stackPtrIndex maybeClosure rcvr | <inline: false> <var: #page type: #'StackPage *'> <var: #pointer type: #'char *'> self assert: (self isSingleContext: aContext). self assert: (objectMemory goodContextSize: aContext). page := self newStackPage. pointer := page baseAddress. theIP := objectMemory fetchPointer: InstructionPointerIndex ofObject: aContext. theMethod := objectMemory followNonImmediateField: MethodIndex ofObject: aContext. + self followNecessaryForwardingInMethod: theMethod. (objectMemory isIntegerObject: theIP) ifFalse: [self error: 'context is not resumable']. theIP := objectMemory integerValueOf: theIP. rcvr := objectMemory followField: ReceiverIndex ofObject: aContext. "If the frame is a closure activation then the closure should be on the stack in the pushed receiver position (closures receiver the value[:value:] messages). Otherwise it should be the receiver proper." maybeClosure := objectMemory followField: ClosureIndex ofObject: aContext. maybeClosure ~= objectMemory nilObject ifTrue: [numArgs := self argumentCountOfClosure: maybeClosure. stackPages longAt: pointer put: maybeClosure] ifFalse: [| header | header := self headerOf: theMethod. numArgs := self argumentCountOfMethodHeader: header. self cppIf: MULTIPLEBYTECODESETS ifTrue: "If this is a synthetic context its IP could be pointing at the CallPrimitive opcode. If so, skip it." [(theIP signedIntFromLong > 0 and: [(self methodHeaderHasPrimitive: header) and: [theIP = (1 + (objectMemory lastPointerOf: theMethod))]]) ifTrue: [theIP := theIP + (self sizeOfCallPrimitiveBytecode: header)]]. stackPages longAt: pointer put: rcvr]. "Put the arguments on the stack" 1 to: numArgs do: [:i| stackPages longAt: (pointer := pointer - BytesPerWord) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "saved caller ip is sender context in base frame" stackPages longAt: (pointer := pointer - BytesPerWord) put: (objectMemory fetchPointer: SenderIndex ofObject: aContext). "base frame's saved fp is null" stackPages longAt: (pointer := pointer - BytesPerWord) put: 0. page baseFP: pointer; headFP: pointer. stackPages longAt: (pointer := pointer - BytesPerWord) put: theMethod. stackPages longAt: (pointer := pointer - BytesPerWord) put: (self encodeFrameFieldHasContext: true isBlock: maybeClosure ~= objectMemory nilObject numArgs: numArgs). self assert: (self frameHasContext: page baseFP). self assert: (self frameNumArgs: page baseFP) == numArgs. stackPages longAt: (pointer := pointer - BytesPerWord) put: aContext. stackPages longAt: (pointer := pointer - BytesPerWord) put: rcvr. stackPtrIndex := self quickFetchInteger: StackPointerIndex ofObject: aContext. self assert: ReceiverIndex + stackPtrIndex < (objectMemory lengthOf: aContext). numArgs + 1 to: stackPtrIndex do: [:i| stackPages longAt: (pointer := pointer - BytesPerWord) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "top of stack is the instruction pointer" theIP := self iframeInstructionPointerForIndex: theIP method: theMethod. stackPages longAt: (pointer := pointer - BytesPerWord) put: theIP. page headSP: pointer. self assert: (self context: aContext hasValidInversePCMappingOf: theIP in: page baseFP). "Mark context as married by setting its sender to the frame pointer plus SmallInteger tags and the InstructionPointer to the saved fp (which ensures correct alignment w.r.t. the frame when we check for validity) plus SmallInteger tags." objectMemory storePointerUnchecked: SenderIndex ofObject: aContext withValue: (self withSmallIntegerTags: page baseFP). objectMemory storePointerUnchecked: InstructionPointerIndex ofObject: aContext withValue: (self withSmallIntegerTags: 0). self assert: (objectMemory isIntegerObject: (objectMemory fetchPointer: SenderIndex ofObject: aContext)). self assert: (self frameOfMarriedContext: aContext) = page baseFP. self assert: (self validStackPageBaseFrame: page). ^page! Item was added: + StackToRegisterMappingCogit subclass: #StackToRegisterMapping2RegArgsCogit + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-JIT'! Item was added: + ----- Method: StackToRegisterMapping2RegArgsCogit>>numRegArgs (in category 'calling convention') ----- + numRegArgs + <api> + "Use of the macro allows the compiler to avoid the call and test in cointerpreter.c" + <cmacro: '() 2'> + ^2! Item was changed: ----- Method: StackToRegisterMappingCogit>>genMarshalledSendDynamicSuper:numArgs: (in category 'bytecode generators') ----- genMarshalledSendDynamicSuper: selector numArgs: numArgs <inline: false> (objectMemory isYoung: selector) ifTrue: [hasYoungReferent := true]. self assert: needsFrame. numArgs > 2 ifTrue: [self MoveCq: numArgs R: SendNumArgsReg]. self MoveCw: selector R: ClassReg. self CallNewspeakSend: (dynamicSuperSendTrampolines at: (numArgs min: NumSendTrampolines - 1)). + usesMethodClass := true. optStatus isReceiverResultRegLive: false. ^self ssPushRegister: ReceiverResultReg! Item was changed: ----- Method: StackToRegisterMappingCogit>>genMarshalledSendSuper:numArgs: (in category 'bytecode generators') ----- genMarshalledSendSuper: selector numArgs: numArgs <inline: false> (objectMemory isYoung: selector) ifTrue: [hasYoungReferent := true]. self assert: needsFrame. numArgs > 2 ifTrue: [self MoveCq: numArgs R: SendNumArgsReg]. self MoveCw: selector R: ClassReg. self CallSend: (superSendTrampolines at: (numArgs min: NumSendTrampolines - 1)). + usesMethodClass := true. optStatus isReceiverResultRegLive: false. ^self ssPushRegister: ReceiverResultReg!

1 0

VM Maker: VMMaker.oscog-eem.548.mcz
by commits＠source.squeak.org 07 Dec '13

07 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.548.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.548 Author: eem Time: 7 December 2013, 2:37:46.314 pm UUID: eac3c43b-073b-4ad1-8520-3849a8d914da Ancestors: VMMaker.oscog-eem.547 Spur: Rename handleForwardedSendFaultForReceiver: to handleForwardedSendFaultForReceiver:stackDelta: to skip the return pc when handling send faults in machine-code sends. Fix followForwardedObjectFields:toDepth: to follow only pointer fields in compiled methods. The system runs. Am able to compare changes in Collections package given all the Character method changes now Character is immediate. =============== Diff against VMMaker.oscog-eem.547 =============== Item was changed: ----- Method: CoInterpreter>>ceDynamicSuperSend:to:numArgs: (in category 'trampolines') ----- ceDynamicSuperSend: selector to: rcvr numArgs: numArgs "Entry-point for an unlinked dynamic super send in a CogMethod. Smalltalk stack looks like receiver args head sp -> sender return pc If an MNU then defer to handleMNUInMachineCodeTo:... which will dispatch the MNU and may choose to allocate a closed PIC with a fast MNU dispatch for this send. Otherwise attempt to link the send site as efficiently as possible. All link attempts may fail; e.g. because we're out of code memory. Continue execution via either executeMethod or interpretMethodFromMachineCode: depending on whether the target method is cogged or not." <api> <option: #NewspeakVM> | class classTag canLinkCacheTag errSelIdx cogMethod mClassMixin mixinApplication | <inline: false> <var: #cogMethod type: #'CogMethod *'> <var: #newCogMethod type: #'CogMethod *'> "self printExternalHeadFrame" "self printStringOf: selector" cogit assertCStackWellAligned. self assert: (objectMemory addressCouldBeOop: rcvr). self sendBreakpoint: selector receiver: rcvr. mClassMixin := self mMethodClass. mixinApplication := self findApplicationOfTargetMixin: mClassMixin startingAtBehavior: (objectMemory fetchClassOf: rcvr). self assert: (objectMemory lengthOf: mixinApplication) > (InstanceSpecificationIndex + 1). classTag := self classTagForClass: (self superclassOf: mixinApplication). class := objectMemory fetchClassOf: rcvr. "what about the read barrier??" canLinkCacheTag := (objectMemory isYoungObject: class) not or: [cogit canLinkToYoungClasses]. argumentCount := numArgs. (self lookupInMethodCacheSel: selector classTag: classTag) ifTrue:"check for coggability because method is in the cache" [self ifAppropriateCompileToNativeCode: newMethod selector: selector] ifFalse: [(objectMemory isOopForwarded: selector) ifTrue: [^self ceDynamicSuperSend: (self handleForwardedSelectorFaultFor: selector) to: rcvr numArgs: numArgs]. (objectMemory isForwardedClassTag: classTag) ifTrue: [^self ceDynamicSuperSend: selector + to: (self handleForwardedSendFaultForReceiver: rcvr stackDelta: 1 "skip return pc") - to: (self handleForwardedSendFaultForReceiver: rcvr) numArgs: numArgs]. messageSelector := selector. (errSelIdx := self lookupMethodNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue: [self handleMNU: errSelIdx InMachineCodeTo: rcvr classForMessage: (objectMemory classForClassTag: classTag). self assert: false "NOTREACHED"]]. "Method found and has a cog method. Attempt to link to it." (self maybeMethodHasCogMethod: newMethod) ifTrue: [cogMethod := self cogMethodOf: newMethod. cogMethod selector = objectMemory nilObject ifTrue: [cogit setSelectorOf: cogMethod to: selector] ifFalse: ["Deal with anonymous accessors, e.g. in Newspeak. The cogMethod may not have the correct selector. If not, try and compile a new method with the correct selector." cogMethod selector ~= selector ifTrue: [(cogit cog: newMethod selector: selector) ifNotNil: [:newCogMethod| cogMethod := newCogMethod]]]. (cogMethod selector = selector and: [canLinkCacheTag]) ifTrue: [cogit linkSendAt: (stackPages longAt: stackPointer) in: (self mframeHomeMethod: framePointer) to: cogMethod offset: cogit dynSuperEntryOffset receiver: rcvr]. instructionPointer := self popStack. self executeNewMethod. self assert: false "NOTREACHED"]. instructionPointer := self popStack. ^self interpretMethodFromMachineCode "NOTREACHED"! Item was changed: ----- Method: CoInterpreter>>ceSend:super:to:numArgs: (in category 'trampolines') ----- ceSend: selector super: superNormalBar to: rcvr numArgs: numArgs "Entry-point for an unlinked send in a CogMethod. Smalltalk stack looks like receiver args head sp -> sender return pc If an MNU then defer to handleMNUInMachineCodeTo:... which will dispatch the MNU and may choose to allocate a closed PIC with a fast MNU dispatch for this send. Otherwise attempt to link the send site as efficiently as possible. All link attempts may fail; e.g. because we're out of code memory. Continue execution via either executeMethod or interpretMethodFromMachineCode: depending on whether the target method is cogged or not." <api> | classTag canLinkCacheTag errSelIdx cogMethod | <inline: false> <var: #cogMethod type: #'CogMethod *'> <var: #newCogMethod type: #'CogMethod *'> "self printExternalHeadFrame" "self printStringOf: selector" cogit assertCStackWellAligned. self assert: (objectMemory addressCouldBeOop: rcvr). self sendBreakpoint: selector receiver: rcvr. superNormalBar = 0 ifTrue: [classTag := objectMemory fetchClassTagOf: rcvr] ifFalse: [classTag := objectMemory classTagForClass: (self superclassOf: (self methodClassOf: (self frameMethodObject: framePointer)))]. canLinkCacheTag := cogit canLinkToYoungClasses or: [(objectMemory isYoungObject: classTag) not]. argumentCount := numArgs. (self lookupInMethodCacheSel: selector classTag: classTag) ifTrue:"check for coggability because method is in the cache" [self ifAppropriateCompileToNativeCode: newMethod selector: selector] ifFalse: [(objectMemory isOopForwarded: selector) ifTrue: [^self ceSend: (self handleForwardedSelectorFaultFor: selector) super: superNormalBar to: rcvr numArgs: numArgs]. (objectMemory isForwardedClassTag: classTag) ifTrue: [self assert: superNormalBar = 0. ^self ceSend: selector super: superNormalBar + to: (self handleForwardedSendFaultForReceiver: rcvr stackDelta: 1 "skip return pc") - to: (self handleForwardedSendFaultForReceiver: rcvr) numArgs: numArgs]. messageSelector := selector. (errSelIdx := self lookupMethodNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue: [(canLinkCacheTag and: [errSelIdx = SelectorDoesNotUnderstand and: [(cogMethod := cogit cogMNUPICSelector: messageSelector methodOperand: (self mnuMethodOrNilFor: rcvr) numArgs: argumentCount) asUnsignedInteger > cogit minCogMethodAddress]]) ifTrue: [cogit linkSendAt: (stackPages longAt: stackPointer) in: (self mframeHomeMethod: framePointer) to: cogMethod offset: (superNormalBar = 0 ifTrue: [cogit entryOffset] ifFalse: [cogit noCheckEntryOffset]) receiver: rcvr]. self handleMNU: errSelIdx InMachineCodeTo: rcvr classForMessage: (objectMemory classForClassTag: classTag). self assert: false "NOTREACHED"]]. "Method found and has a cog method. Attempt to link to it. The receiver's class may be young. If the Cogit can't store young classes in inline caches we can link to an open PIC instead." (self maybeMethodHasCogMethod: newMethod) ifTrue: [cogMethod := self cogMethodOf: newMethod. cogMethod selector = objectMemory nilObject ifTrue: [cogit setSelectorOf: cogMethod to: selector] ifFalse: ["Deal with anonymous accessors, e.g. in Newspeak. The cogMethod may not have the correct selector. If not, try and compile a new method with the correct selector." cogMethod selector ~= selector ifTrue: [(cogit cog: newMethod selector: selector) ifNotNil: [:newCogMethod| cogMethod := newCogMethod]]]. (cogMethod selector = selector and: [canLinkCacheTag]) ifTrue: [cogit linkSendAt: (stackPages longAt: stackPointer) in: (self mframeHomeMethod: framePointer) to: cogMethod offset: (superNormalBar = 0 ifTrue: [cogit entryOffset] ifFalse: [cogit noCheckEntryOffset]) receiver: rcvr] ifFalse: "If patchToOpenPICFor:.. returns we're out of code memory" [cogit patchToOpenPICFor: selector numArgs: numArgs receiver: rcvr]. instructionPointer := self popStack. self executeNewMethod. self assert: false "NOTREACHED"]. instructionPointer := self popStack. ^self interpretMethodFromMachineCode "NOTREACHED"! Item was changed: ----- Method: CoInterpreter>>ceSendFromInLineCacheMiss: (in category 'trampolines') ----- ceSendFromInLineCacheMiss: cogMethodOrPIC "Send from an Open PIC when the first-level method lookup probe has failed, or to continue when PIC creation has failed (e.g. because we're out of code space), or when a send has failed due to a forwarded receiver." <api> <var: #cogMethodOrPIC type: #'CogMethod *'> | numArgs rcvr classTag errSelIdx | "self printFrame: stackPage headFP WithSP: stackPage headSP" "self printStringOf: selector" numArgs := cogMethodOrPIC cmNumArgs. rcvr := self stackValue: numArgs + 1. "skip return pc" self assert: (objectMemory addressCouldBeOop: rcvr). classTag := objectMemory fetchClassTagOf: rcvr. argumentCount := numArgs. (self lookupInMethodCacheSel: cogMethodOrPIC selector classTag: classTag) ifTrue:"check for coggability because method is in the cache" [self ifAppropriateCompileToNativeCode: newMethod selector: cogMethodOrPIC selector] ifFalse: [(objectMemory isOopForwarded: cogMethodOrPIC selector) ifTrue: [self handleForwardedSelectorFaultFor: cogMethodOrPIC selector. ^self ceSendFromInLineCacheMiss: cogMethodOrPIC]. (objectMemory isForwardedClassTag: classTag) ifTrue: + [self handleForwardedSendFaultForReceiver: rcvr stackDelta: 1 "skip return pc". - [self handleForwardedSendFaultForReceiver: rcvr. ^self ceSendFromInLineCacheMiss: cogMethodOrPIC]. messageSelector := cogMethodOrPIC selector. (errSelIdx := self lookupMethodNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue: [self handleMNU: errSelIdx InMachineCodeTo: rcvr classForMessage: (objectMemory classForClassTag: classTag). "NOTREACHED" self assert: false]]. instructionPointer := self popStack. (self maybeMethodHasCogMethod: newMethod) ifTrue: [self executeNewMethod. self assert: false "NOTREACHED"]. ^self interpretMethodFromMachineCode "NOTREACHED"! Item was removed: - ----- Method: CoInterpreter>>handleForwardedSendFaultForReceiver: (in category 'message sending') ----- - handleForwardedSendFaultForReceiver: forwardedReceiver - "Handle a send fault that may be due to a send to a forwarded object. - Unforward the receiver on the stack and answer it." - <option: #SpurObjectMemory> - | rcvr | - <inline: false> - "should *not* be a super send, so the receiver should be forwarded." - self assert: (objectMemory isOopForwarded: forwardedReceiver). - - self assert: (self stackValue: argumentCount) = forwardedReceiver. - rcvr := objectMemory followForwarded: forwardedReceiver. - self stackValue: argumentCount put: rcvr. - self followForwardedFrameContents: framePointer - stackPointer: stackPointer + (argumentCount + 1 * BytesPerWord). "don't repeat effort" - (objectMemory isPointers: (self frameReceiver: framePointer)) ifTrue: - [objectMemory - followForwardedObjectFields: (self frameReceiver: framePointer) - toDepth: 0]. - self followForwardedFieldsInCurrentMethod. - ^rcvr! Item was added: + ----- Method: CoInterpreter>>handleForwardedSendFaultForReceiver:stackDelta: (in category 'message sending') ----- + handleForwardedSendFaultForReceiver: forwardedReceiver stackDelta: stackDelta + "Handle a send fault that may be due to a send to a forwarded object. + Unforward the receiver on the stack and answer it." + <option: #SpurObjectMemory> + | rcvrStackIndex rcvr | + <inline: false> + "should *not* be a super send, so the receiver should be forwarded." + self assert: (objectMemory isOopForwarded: forwardedReceiver). + rcvrStackIndex := argumentCount + stackDelta. + self assert: (self stackValue: rcvrStackIndex) = forwardedReceiver. + rcvr := objectMemory followForwarded: forwardedReceiver. + self stackValue: rcvrStackIndex put: rcvr. + self followForwardedFrameContents: framePointer + stackPointer: stackPointer + (rcvrStackIndex + 1 * BytesPerWord). "don't repeat effort" + (objectMemory isPointers: (self frameReceiver: framePointer)) ifTrue: + [objectMemory + followForwardedObjectFields: (self frameReceiver: framePointer) + toDepth: 0]. + self followForwardedFieldsInCurrentMethod. + ^rcvr! Item was changed: ----- Method: SpurMemoryManager>>followForwardedObjectFields:toDepth: (in category 'forwarding') ----- followForwardedObjectFields: objOop toDepth: depth "follow pointers in the object to depth. How to avoid cyclic structures?? A temproary mark bit?" | oop | self assert: ((self isPointers: objOop) or: [self isOopCompiledMethod: objOop]). + 0 to: (self numPointerSlotsOf: objOop) - 1 do: - 0 to: (self numSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. ((self isNonImmediate: oop) and: [self isForwarded: oop]) ifTrue: [oop := self followForwarded: oop. self storePointer: i ofObject: objOop withValue: oop]. depth > 0 ifTrue: [self followForwardedObjectFields: objOop toDepth: depth - 1]]!

1 0

VM Maker: VMMaker.oscog-eem.547.mcz
by commits＠source.squeak.org 07 Dec '13

07 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.547.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.547 Author: eem Time: 7 December 2013, 1:39:54.394 pm UUID: 5a0db750-d6a5-4742-b20a-e35ecb43ab38 Ancestors: VMMaker.oscog-eem.546 Rename handleForwardedSendFaultFor: to handleForwardedSendFaultForTag:. Add handleForwardedSelectorFaultFor:. Implement forwarding fault handling in ceSend:super:to:numArgs: et al and rewrite the handling in ceSendFromInLineCacheMiss: to match. Abstract out the method following in handleForwardedSelectorFaultFor: and override in CoInterpreter to follow the cogMethod. Follow forwarded methdos in the method cache post-become. Rename genEnsureRegNotForwarded:scratchReg: to genEnsureObjInRegRegNotForwarded:scratchReg: and use to implement forwarder following in Cogit special selector #== (and rewritten lit var access). Comment forwarder following in genGetClassObjectOf:into:scratchReg:instRegIsReceiver: Fix Spur's couldBeObject: to filter-out 0 (for closed PICs). Fix printOopShortInner: to print forwarders (for frame printing). Print how much space is missing when the scavenger eden limit - freeStart > coInterpreter interpreterAllocationReserveBytes assert fails on scavenge. Slang and clients: Fix dead code elimination in if exprs when there expr is just a single boolean-constant-returning send. Refactor var:type:array: in terms of arrayInitializerCalled:for:type:. Fix decls of memory, heapBase & labelCounter so they're not hacked as static. Make cePositive32BitIntegerTrampoline & eFlushICache private. =============== Diff against VMMaker.oscog-eem.546 =============== Item was changed: ----- Method: CCodeGenerator>>emitCVariablesOn: (in category 'C code generator') ----- emitCVariablesOn: aStream "Store the global variable declarations on the given stream." aStream cr; nextPutAll: '/*** Variables ***/'; cr. (self sortStrings: variables) do: [:var | | varString decl | varString := var asString. decl := variableDeclarations at: varString ifAbsent: ['sqInt ' , varString]. decl first == $# "support cgen var: #bytecodeSetSelector declareC: '#define bytecodeSetSelector 0' hack" ifTrue: [aStream nextPutAll: decl; cr] ifFalse: [self isGeneratingPluginCode ifTrue: [varString = 'interpreterProxy' ifTrue: "quite special..." [self preDeclareInterpreterProxyOn: aStream] ifFalse: [(decl beginsWith: 'static') ifFalse: [aStream nextPutAll: 'static ']]] ifFalse: + [(vmClass mustBeGlobal: varString) + ifTrue: + [(decl beginsWith: 'static ') ifTrue: + [decl := decl allButFirst: 7]] + ifFalse: + [(decl beginsWith: 'static') ifFalse: + [aStream nextPutAll: 'static ']]]. - [(vmClass mustBeGlobal: varString) ifFalse: - [(decl beginsWith: 'static') ifFalse: - [aStream nextPutAll: 'static ']]]. aStream nextPutAll: decl; nextPut: $;; cr]]. aStream cr! Item was changed: ----- Method: CCodeGenerator>>emitGlobalCVariablesOn: (in category 'C code generator') ----- emitGlobalCVariablesOn: aStream "Store the global variable declarations on the given stream." aStream cr; nextPutAll: '/*** Global Variables ***/'; cr. (self sortStrings: (variables select: [:v| vmClass mustBeGlobal: v])) do: [:var | | varString decl | varString := var asString. decl := variableDeclarations at: varString ifAbsent: ['sqInt ' , varString]. decl first == $# "support cgen var: #bytecodeSetSelector declareC: '#define bytecodeSetSelector 0' hack" ifTrue: [aStream nextPutAll: decl; cr] ifFalse: [((decl includesSubString: ' private ') + "or: [decl beginsWith: 'static']") ifFalse: "work-around hack to prevent localization of variables only referenced once." - or: [decl beginsWith: 'static']) ifFalse: "work-around hack to prevent localization of variables only referenced once." [(decl includes: $=) ifTrue: [decl := decl copyFrom: 1 to: (decl indexOf: $=) - 1]. aStream nextPutAll: decl; nextPut: $;; cr]]]. aStream cr! Item was changed: ----- Method: CCodeGenerator>>nilOrBooleanConstantReceiverOf: (in category 'utilities') ----- nilOrBooleanConstantReceiverOf: aNode "Answer nil or the boolean constant that is the receiver of the given message send. Used to suppress conditional code when the condition is a translation-time constant." generateDeadCode ifTrue:[^nil]. (aNode isConstant and: [#(true false) includes: aNode value]) ifTrue: [^aNode value]. aNode isSend ifTrue: [((#(or: and:) includes: aNode selector) and: [aNode args last isStmtList and: [aNode args last statements size = 1]]) ifTrue: [(self nilOrBooleanConstantReceiverOf: aNode receiver) ifNotNil: [:rcvr| (self nilOrBooleanConstantReceiverOf: aNode args last statements first) ifNotNil: [:arg| ^rcvr perform: aNode selector with: [arg]]]]. ((#(= ~= < > <= >=) includes: aNode selector) and: [(aNode receiver isConstant and: [aNode receiver value isInteger]) and: [(aNode args first isConstant and: [aNode args first value isInteger])]]) ifTrue: + [^aNode receiver value perform: aNode selector with: aNode args first value]. + (self methodNamed: aNode selector) ifNotNil: + [:m| + (m statements size = 1 + and: [m statements last isReturn]) ifTrue: + [^self nilOrBooleanConstantReceiverOf: m statements last expression]]]. - [^aNode receiver value perform: aNode selector with: aNode args first value]]. ^nil ! Item was removed: - ----- Method: CCodeGenerator>>printArray:on: (in category 'private') ----- - printArray: array on: aStream - | first | - first := true. - 1 to: array size do: - [:i | - first - ifTrue: [first := false] - ifFalse: [aStream nextPutAll: ', ']. - i \\ 16 = 1 ifTrue: [aStream cr]. - self printInt: (array at: i) on: aStream]! Item was removed: - ----- Method: CCodeGenerator>>printInt:on: (in category 'private') ----- - printInt: int on: aStream - aStream print: int. - (int between: -2147483648 and: 2147483647) - ifFalse: [(int between: 2147483648 and: 4294967295) - ifTrue: [aStream nextPut: $U] - ifFalse: [aStream nextPut: $L]]! Item was changed: ----- Method: CCodeGenerator>>var:type:array: (in category 'public') ----- + var: varName type: cType array: array + "Use this in preference to #var:declareC: when possible. This produces a C + statment of the form + int * fooArray[]={1,2,3} + See also #var:type: for simple var decls" - var: varName type: type array: array - "use this in preference to #var:declareC: when possible. This produces a C statment of the form - int * fooArray[]={1,2,3} - See also #var:type: for simple var decls" self var: varName + declareC: (self arrayInitializerCalled: varName for: array type: cType)! - declareC: (String streamContents: [:s | - s nextPutAll: type. - s space. - s nextPutAll: varName. - s nextPutAll: '[] = {'. - self printArray: array on: s. - s nextPut: $}])! Item was changed: ----- Method: CoInterpreter class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator "Override to avoid repeating StackInterpreter's declarations and add our own extensions" | threaded | self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses" threaded := aCCodeGenerator vmClass isThreadedVM. aCCodeGenerator addHeaderFile:'"sqCogStackAlignment.h"'; addHeaderFile:'"cogmethod.h"'; addHeaderFile: (threaded ifTrue: ['"cointerpmt.h"'] ifFalse: ['"cointerp.h"']); addHeaderFile:'"cogit.h"'. self declareInterpreterVersionIn: aCCodeGenerator defaultName: (threaded ifTrue: ['Cog MT'] ifFalse: ['Cog']). aCCodeGenerator + var: #heapBase type: #usqInt; + var: #statCodeCompactionUsecs type: #usqLong; - var: #heapBase - declareC: 'static usqInt heapBase'; var: #maxLiteralCountForCompile + declareC: 'sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* ', MaxLiteralCountForCompile printString, ' */'; - declareC: 'sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* ', MaxLiteralCountForCompile printString, ' */'; var: #minBackwardJumpCountForCompile + declareC: 'sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* ', MinBackwardJumpCountForCompile printString, ' */'. - declareC: 'sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* ', MinBackwardJumpCountForCompile printString, ' */'. aCCodeGenerator var: #reenterInterpreter declareC: 'jmp_buf reenterInterpreter; /* private export */'. aCCodeGenerator - var: #statCodeCompactionUsecs - type: #usqLong. - aCCodeGenerator var: #primTraceLogIndex type: #'unsigned char'; var: #primTraceLog declareC: 'sqInt primTraceLog[256]'; var: #traceLog declareC: 'sqInt traceLog[TraceBufferSize /* ', TraceBufferSize printString, ' */]'; + var: #traceSources type: #'char *' array: TraceSources! - var: #traceSources - declareC: (aCCodeGenerator - arrayInitializerCalled: 'traceSources' - for: TraceSources - type: 'char *')! Item was changed: ----- Method: CoInterpreter>>ceDynamicSuperSend:to:numArgs: (in category 'trampolines') ----- ceDynamicSuperSend: selector to: rcvr numArgs: numArgs "Entry-point for an unlinked dynamic super send in a CogMethod. Smalltalk stack looks like receiver args head sp -> sender return pc If an MNU then defer to handleMNUInMachineCodeTo:... which will dispatch the MNU and may choose to allocate a closed PIC with a fast MNU dispatch for this send. Otherwise attempt to link the send site as efficiently as possible. All link attempts may fail; e.g. because we're out of code memory. Continue execution via either executeMethod or interpretMethodFromMachineCode: depending on whether the target method is cogged or not." <api> <option: #NewspeakVM> | class classTag canLinkCacheTag errSelIdx cogMethod mClassMixin mixinApplication | <inline: false> <var: #cogMethod type: #'CogMethod *'> <var: #newCogMethod type: #'CogMethod *'> "self printExternalHeadFrame" "self printStringOf: selector" cogit assertCStackWellAligned. self assert: (objectMemory addressCouldBeOop: rcvr). self sendBreakpoint: selector receiver: rcvr. mClassMixin := self mMethodClass. mixinApplication := self findApplicationOfTargetMixin: mClassMixin startingAtBehavior: (objectMemory fetchClassOf: rcvr). self assert: (objectMemory lengthOf: mixinApplication) > (InstanceSpecificationIndex + 1). classTag := self classTagForClass: (self superclassOf: mixinApplication). class := objectMemory fetchClassOf: rcvr. "what about the read barrier??" canLinkCacheTag := (objectMemory isYoungObject: class) not or: [cogit canLinkToYoungClasses]. argumentCount := numArgs. (self lookupInMethodCacheSel: selector classTag: classTag) ifTrue:"check for coggability because method is in the cache" [self ifAppropriateCompileToNativeCode: newMethod selector: selector] ifFalse: + [(objectMemory isOopForwarded: selector) ifTrue: + [^self + ceDynamicSuperSend: (self handleForwardedSelectorFaultFor: selector) + to: rcvr + numArgs: numArgs]. + (objectMemory isForwardedClassTag: classTag) ifTrue: + [^self + ceDynamicSuperSend: selector + to: (self handleForwardedSendFaultForReceiver: rcvr) + numArgs: numArgs]. + messageSelector := selector. - [messageSelector := selector. (errSelIdx := self lookupMethodNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue: [self handleMNU: errSelIdx InMachineCodeTo: rcvr classForMessage: (objectMemory classForClassTag: classTag). self assert: false "NOTREACHED"]]. "Method found and has a cog method. Attempt to link to it." (self maybeMethodHasCogMethod: newMethod) ifTrue: [cogMethod := self cogMethodOf: newMethod. cogMethod selector = objectMemory nilObject ifTrue: [cogit setSelectorOf: cogMethod to: selector] ifFalse: ["Deal with anonymous accessors, e.g. in Newspeak. The cogMethod may not have the correct selector. If not, try and compile a new method with the correct selector." cogMethod selector ~= selector ifTrue: [(cogit cog: newMethod selector: selector) ifNotNil: [:newCogMethod| cogMethod := newCogMethod]]]. (cogMethod selector = selector and: [canLinkCacheTag]) ifTrue: [cogit linkSendAt: (stackPages longAt: stackPointer) in: (self mframeHomeMethod: framePointer) to: cogMethod offset: cogit dynSuperEntryOffset receiver: rcvr]. instructionPointer := self popStack. self executeNewMethod. self assert: false "NOTREACHED"]. instructionPointer := self popStack. ^self interpretMethodFromMachineCode "NOTREACHED"! Item was changed: ----- Method: CoInterpreter>>ceInterpretMethodFromPIC:receiver: (in category 'trampolines') ----- ceInterpretMethodFromPIC: aMethodObj receiver: rcvr <api> | pic primitiveIndex | <var: #pic type: #'CogMethod *'> self assert: (self methodHasCogMethod: aMethodObj) not. "pop off inner return and locate open PIC" pic := self cCoerceSimple: self popStack - cogit interpretOffset to: #'CogMethod *'. self assert: (pic cmType = CMOpenPIC or: [pic cmType = CMClosedPIC]). + "If found from an open PIC then it must be an uncogged method and, since it's been found - "If found from an open PIC then it must be an uncoged method and, since it's been found in the method cache, should be cogged if possible. If found from a closed PIC it should be interpreted (since being reached by that route implies it is uncoggable)." pic cmType = CMOpenPIC ifTrue: [(self methodShouldBeCogged: aMethodObj) ifTrue: [cogit cog: aMethodObj selector: pic selector. (self methodHasCogMethod: aMethodObj) ifTrue: [self executeCogMethodFromUnlinkedSend: (self cogMethodOf: aMethodObj) withReceiver: rcvr]]] ifFalse: [self assert: (cogCompiledCodeCompactionCalledFor or: [(cogit methodShouldBeCogged: aMethodObj) not])]. messageSelector := pic selector. newMethod := aMethodObj. primitiveIndex := self primitiveIndexOf: aMethodObj. primitiveFunctionPointer := self functionPointerFor: primitiveIndex inClass: objectMemory nilObject. argumentCount := pic cmNumArgs. instructionPointer := self popStack. ^self interpretMethodFromMachineCode "NOTREACHED"! Item was changed: ----- Method: CoInterpreter>>ceSend:super:to:numArgs: (in category 'trampolines') ----- ceSend: selector super: superNormalBar to: rcvr numArgs: numArgs "Entry-point for an unlinked send in a CogMethod. Smalltalk stack looks like receiver args head sp -> sender return pc If an MNU then defer to handleMNUInMachineCodeTo:... which will dispatch the MNU and may choose to allocate a closed PIC with a fast MNU dispatch for this send. Otherwise attempt to link the send site as efficiently as possible. All link attempts may fail; e.g. because we're out of code memory. Continue execution via either executeMethod or interpretMethodFromMachineCode: depending on whether the target method is cogged or not." <api> | classTag canLinkCacheTag errSelIdx cogMethod | <inline: false> <var: #cogMethod type: #'CogMethod *'> <var: #newCogMethod type: #'CogMethod *'> "self printExternalHeadFrame" "self printStringOf: selector" cogit assertCStackWellAligned. self assert: (objectMemory addressCouldBeOop: rcvr). self sendBreakpoint: selector receiver: rcvr. superNormalBar = 0 ifTrue: [classTag := objectMemory fetchClassTagOf: rcvr] ifFalse: [classTag := objectMemory classTagForClass: (self superclassOf: (self methodClassOf: (self frameMethodObject: framePointer)))]. canLinkCacheTag := cogit canLinkToYoungClasses or: [(objectMemory isYoungObject: classTag) not]. argumentCount := numArgs. (self lookupInMethodCacheSel: selector classTag: classTag) ifTrue:"check for coggability because method is in the cache" [self ifAppropriateCompileToNativeCode: newMethod selector: selector] ifFalse: + [(objectMemory isOopForwarded: selector) ifTrue: + [^self + ceSend: (self handleForwardedSelectorFaultFor: selector) + super: superNormalBar + to: rcvr + numArgs: numArgs]. + (objectMemory isForwardedClassTag: classTag) ifTrue: + [self assert: superNormalBar = 0. + ^self + ceSend: selector + super: superNormalBar + to: (self handleForwardedSendFaultForReceiver: rcvr) + numArgs: numArgs]. + messageSelector := selector. - [messageSelector := selector. (errSelIdx := self lookupMethodNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue: [(canLinkCacheTag and: [errSelIdx = SelectorDoesNotUnderstand and: [(cogMethod := cogit cogMNUPICSelector: messageSelector methodOperand: (self mnuMethodOrNilFor: rcvr) numArgs: argumentCount) asUnsignedInteger > cogit minCogMethodAddress]]) ifTrue: [cogit linkSendAt: (stackPages longAt: stackPointer) in: (self mframeHomeMethod: framePointer) to: cogMethod offset: (superNormalBar = 0 ifTrue: [cogit entryOffset] ifFalse: [cogit noCheckEntryOffset]) receiver: rcvr]. self handleMNU: errSelIdx InMachineCodeTo: rcvr classForMessage: (objectMemory classForClassTag: classTag). self assert: false "NOTREACHED"]]. "Method found and has a cog method. Attempt to link to it. The receiver's class may be young. If the Cogit can't store young classes in inline caches we can link to an open PIC instead." (self maybeMethodHasCogMethod: newMethod) ifTrue: [cogMethod := self cogMethodOf: newMethod. cogMethod selector = objectMemory nilObject ifTrue: [cogit setSelectorOf: cogMethod to: selector] ifFalse: ["Deal with anonymous accessors, e.g. in Newspeak. The cogMethod may not have the correct selector. If not, try and compile a new method with the correct selector." cogMethod selector ~= selector ifTrue: [(cogit cog: newMethod selector: selector) ifNotNil: [:newCogMethod| cogMethod := newCogMethod]]]. (cogMethod selector = selector and: [canLinkCacheTag]) ifTrue: [cogit linkSendAt: (stackPages longAt: stackPointer) in: (self mframeHomeMethod: framePointer) to: cogMethod offset: (superNormalBar = 0 ifTrue: [cogit entryOffset] ifFalse: [cogit noCheckEntryOffset]) receiver: rcvr] ifFalse: "If patchToOpenPICFor:.. returns we're out of code memory" [cogit patchToOpenPICFor: selector numArgs: numArgs receiver: rcvr]. instructionPointer := self popStack. self executeNewMethod. self assert: false "NOTREACHED"]. instructionPointer := self popStack. ^self interpretMethodFromMachineCode "NOTREACHED"! Item was changed: ----- Method: CoInterpreter>>ceSendFromInLineCacheMiss: (in category 'trampolines') ----- ceSendFromInLineCacheMiss: cogMethodOrPIC "Send from an Open PIC when the first-level method lookup probe has failed, or to continue when PIC creation has failed (e.g. because we're out of code space), or when a send has failed due to a forwarded receiver." <api> <var: #cogMethodOrPIC type: #'CogMethod *'> | numArgs rcvr classTag errSelIdx | "self printFrame: stackPage headFP WithSP: stackPage headSP" "self printStringOf: selector" numArgs := cogMethodOrPIC cmNumArgs. rcvr := self stackValue: numArgs + 1. "skip return pc" self assert: (objectMemory addressCouldBeOop: rcvr). classTag := objectMemory fetchClassTagOf: rcvr. argumentCount := numArgs. (self lookupInMethodCacheSel: cogMethodOrPIC selector classTag: classTag) ifTrue:"check for coggability because method is in the cache" [self ifAppropriateCompileToNativeCode: newMethod selector: cogMethodOrPIC selector] ifFalse: + [(objectMemory isOopForwarded: cogMethodOrPIC selector) ifTrue: + [self handleForwardedSelectorFaultFor: cogMethodOrPIC selector. + ^self ceSendFromInLineCacheMiss: cogMethodOrPIC]. + (objectMemory isForwardedClassTag: classTag) ifTrue: + [self handleForwardedSendFaultForReceiver: rcvr. + ^self ceSendFromInLineCacheMiss: cogMethodOrPIC]. + messageSelector := cogMethodOrPIC selector. - [messageSelector := cogMethodOrPIC selector. - ((objectMemory isOopForwarded: messageSelector) - or: [objectMemory isForwardedClassTag: classTag]) ifTrue: - [(objectMemory isOopForwarded: messageSelector) ifTrue: - [messageSelector := self handleForwardedSelectorFaultFor: messageSelector]. - (objectMemory isForwardedClassTag: classTag) ifTrue: - [classTag := self handleForwardedSendFaultFor: classTag]]. (errSelIdx := self lookupMethodNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue: [self handleMNU: errSelIdx InMachineCodeTo: rcvr classForMessage: (objectMemory classForClassTag: classTag). "NOTREACHED" self assert: false]]. instructionPointer := self popStack. (self maybeMethodHasCogMethod: newMethod) ifTrue: [self executeNewMethod. self assert: false "NOTREACHED"]. ^self interpretMethodFromMachineCode "NOTREACHED"! Item was changed: ----- Method: CoInterpreter>>findNewMethodInClassTag: (in category 'message sending') ----- findNewMethodInClassTag: classTagArg "Find the compiled method to be run when the current messageSelector is sent to the given classTag, setting the values of newMethod and primitiveIndex." | ok class classTag | <inline: false> ok := self lookupInMethodCacheSel: messageSelector classTag: classTagArg. ok ifTrue: [self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector] ifFalse: ["entry was not found in the cache; perhaps soemthing was forwarded." classTag := classTagArg. ((objectMemory isOopForwarded: messageSelector) or: [objectMemory isForwardedClassTag: classTag]) ifTrue: [(objectMemory isOopForwarded: messageSelector) ifTrue: [messageSelector := self handleForwardedSelectorFaultFor: messageSelector]. (objectMemory isForwardedClassTag: classTag) ifTrue: + [classTag := self handleForwardedSendFaultForTag: classTag]. - [classTag := self handleForwardedSendFaultFor: classTag]. ok := self lookupInMethodCacheSel: messageSelector classTag: classTag. ok ifTrue: [^self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector]]. "entry was not found in the cache; look it up the hard way " class := objectMemory classForClassTag: classTag. self lookupMethodInClass: class. self addNewMethodToCache: class]! Item was added: + ----- Method: CoInterpreter>>followForwardedFieldsInCurrentMethod (in category 'message sending') ----- + followForwardedFieldsInCurrentMethod + | cogMethod | + <var: #cogMethod type: #'CogMethod *'> + <inline: false> + (self isMachineCodeFrame: framePointer) + ifTrue: + [cogMethod := self mframeHomeMethod: framePointer. + objectMemory + followForwardedObjectFields: cogMethod methodObject + toDepth: 0. + cogit followForwardedLiteralsIn: cogMethod] + ifFalse: + [objectMemory + followForwardedObjectFields: method + toDepth: 0]! Item was added: + ----- Method: CoInterpreter>>followForwardedMethods (in category 'object memory support') ----- + followForwardedMethods + <doNotGenerate> + cogit followForwardedMethods! Item was added: + ----- Method: CoInterpreter>>handleForwardedSendFaultForReceiver: (in category 'message sending') ----- + handleForwardedSendFaultForReceiver: forwardedReceiver + "Handle a send fault that may be due to a send to a forwarded object. + Unforward the receiver on the stack and answer it." + <option: #SpurObjectMemory> + | rcvr | + <inline: false> + "should *not* be a super send, so the receiver should be forwarded." + self assert: (objectMemory isOopForwarded: forwardedReceiver). + + self assert: (self stackValue: argumentCount) = forwardedReceiver. + rcvr := objectMemory followForwarded: forwardedReceiver. + self stackValue: argumentCount put: rcvr. + self followForwardedFrameContents: framePointer + stackPointer: stackPointer + (argumentCount + 1 * BytesPerWord). "don't repeat effort" + (objectMemory isPointers: (self frameReceiver: framePointer)) ifTrue: + [objectMemory + followForwardedObjectFields: (self frameReceiver: framePointer) + toDepth: 0]. + self followForwardedFieldsInCurrentMethod. + ^rcvr! Item was changed: ----- Method: CoInterpreter>>internalFindNewMethod (in category 'message sending') ----- internalFindNewMethod "Find the compiled method to be run when the current messageSelector is sent to the given class, setting the values of newMethod and primitiveIndex." | ok | <inline: true> ok := self lookupInMethodCacheSel: messageSelector classTag: lkupClassTag. ok ifTrue: [self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector] ifFalse: [self externalizeIPandSP. ((objectMemory isOopForwarded: messageSelector) or: [objectMemory isForwardedClassTag: lkupClassTag]) ifTrue: [(objectMemory isOopForwarded: messageSelector) ifTrue: [messageSelector := self handleForwardedSelectorFaultFor: messageSelector]. (objectMemory isForwardedClassTag: lkupClassTag) ifTrue: + [lkupClassTag := self handleForwardedSendFaultForTag: lkupClassTag]. - [lkupClassTag := self handleForwardedSendFaultFor: lkupClassTag]. ok := self lookupInMethodCacheSel: messageSelector classTag: lkupClassTag. ok ifTrue: [^self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector]]. lkupClass := objectMemory classForClassTag: lkupClassTag. self lookupMethodInClass: lkupClass. self internalizeIPandSP. self addNewMethodToCache: lkupClass]! Item was added: + ----- Method: CogObjectRepresentation>>genEnsureObjInRegRegNotForwarded:scratchReg: (in category 'compile abstract instructions') ----- + genEnsureObjInRegRegNotForwarded: reg scratchReg: scratch + "Make sure that the object in reg is not forwarded. By default there is + nothing to do. Subclasses for memory managers that forward will override." + ^0! Item was removed: - ----- Method: CogObjectRepresentation>>genEnsureRegNotForwarded:scratchReg: (in category 'compile abstract instructions') ----- - genEnsureRegNotForwarded: reg scratchReg: scratch - "Make sure that the obejct in reg is not forwarded. By default there is - nothing to do. Subclasses for memory managers that forward will override." - ^0! Item was changed: ----- Method: CogObjectRepresentationForSpur>>couldBeObject: (in category 'garbage collection') ----- couldBeObject: literal + ^(objectMemory isNonImmediate: literal) + and: [self oop: literal isGreaterThanOrEqualTo: objectMemory startOfMemory]! - ^objectMemory isNonImmediate: literal! Item was added: + ----- Method: CogObjectRepresentationForSpur>>genEnsureObjInRegRegNotForwarded:scratchReg: (in category 'compile abstract instructions') ----- + genEnsureObjInRegRegNotForwarded: reg scratchReg: scratch + "Make sure that the obejct in reg is not forwarded." + | loop ok | + <var: #ok type: #'AbstractInstruction *'> + <var: #loop type: #'AbstractInstruction *'> + self assert: reg ~= scratch. + loop := cogit Label. + self genGetClassIndexOfNonImm: reg into: scratch. + cogit CmpCq: objectMemory isForwardedObjectClassIndexPun + R: TempReg. + ok := cogit JumpNonZero: 0. + self genLoadSlot: 0 sourceReg: reg destReg: reg. + cogit Jump: loop. + ok jmpTarget: cogit Label. + ^0! Item was removed: - ----- Method: CogObjectRepresentationForSpur>>genEnsureRegNotForwarded:scratchReg: (in category 'compile abstract instructions') ----- - genEnsureRegNotForwarded: reg scratchReg: scratch - "Make sure that the obejct in reg is not forwarded." - | loop ok | - <var: #ok type: #'AbstractInstruction *'> - <var: #loop type: #'AbstractInstruction *'> - self assert: reg ~= scratch. - loop := cogit Label. - self genGetClassIndexOfNonImm: reg into: scratch. - cogit CmpCq: objectMemory isForwardedObjectClassIndexPun - R: TempReg. - ok := cogit JumpNonZero: 0. - self genLoadSlot: 0 sourceReg: reg destReg: reg. - cogit Jump: loop. - ok jmpTarget: cogit Label. - ^0! Item was changed: ----- Method: CogObjectRepresentationForSpur>>genGetClassObjectOf:into:scratchReg:instRegIsReceiver: (in category 'compile abstract instructions') ----- genGetClassObjectOf: instReg into: destReg scratchReg: scratchReg instRegIsReceiver: instRegIsReceiver + "Fetch the instance's class into destReg. If the instance is forwarded, follow forwarding." - "Fetch the instance's class into destReg." | jumpIsImm jumpNotForwarded loop | <var: #jumpIsImm type: #'AbstractInstruction *'> <var: #jumpNotForwarded type: #'AbstractInstruction *'> <var: #loop type: #'AbstractInstruction *'> instReg = destReg ifTrue: [^BadRegisterSet]. loop := cogit MoveR: instReg R: scratchReg. cogit AndCq: objectMemory tagMask R: scratchReg. jumpIsImm := cogit JumpNonZero: 0. self flag: #endianness. "Get least significant half of header word in destReg" cogit MoveMw: 0 r: instReg R: scratchReg. "mask off class index" cogit AndCq: objectMemory classIndexMask R: scratchReg. instRegIsReceiver ifFalse: ["if it is forwarded..." cogit CmpCq: objectMemory isForwardedObjectClassIndexPun R: scratchReg. jumpNotForwarded := cogit JumpNonZero: 0. "...follow the forwarding pointer and loop to fetch its classIndex" cogit MoveMw: objectMemory baseHeaderSize r: instReg R: instReg. cogit Jump: loop. jumpNotForwarded jmpTarget: cogit Label]. jumpIsImm jmpTarget: (cogit MoveR: scratchReg R: destReg). cogit PushR: instReg. self genGetClassObjectOfClassIndex: destReg into: instReg scratchReg: TempReg. cogit MoveR: instReg R: destReg. cogit PopR: instReg. ^0! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>isOopForwarded: (in category 'garbage collection') ----- + isOopForwarded: oop + "Compatibility wth SpurMemoryManager. In ObjectMemory, no forwarding pointers + are visible to the VM." + <inline: true> + ^false! Item was changed: ----- Method: Cogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator #( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation' 'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass' 'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses' 'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters' 'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep') do: [:simulationVariableNotNeededForRealVM| aCCodeGenerator removeVariable: simulationVariableNotNeededForRealVM]. NewspeakVM ifFalse: [#( 'dynSuperEntry' 'dynSuperEntryAlignment' 'dynamicSuperSendTrampolines' 'ceImplicitReceiverTrampoline' 'ceExplicitReceiverTrampoline' 'cmDynSuperEntryOffset') do: [:variableNotNeededInNormalVM| aCCodeGenerator removeVariable: variableNotNeededInNormalVM]]. aCCodeGenerator removeConstant: #COGMTVM. "this should be defined at compile time" aCCodeGenerator addHeaderFile:'<stddef.h>'; "for e.g. offsetof" addHeaderFile:'"sqCogStackAlignment.h"'; addHeaderFile:'"cogmethod.h"'; addHeaderFile:'#if COGMTVM'; addHeaderFile:'"cointerpmt.h"'; addHeaderFile:'#else'; addHeaderFile:'"cointerp.h"'; addHeaderFile:'#endif'; addHeaderFile:'"cogit.h"'; addHeaderFile:'"dispdbg.h"'. aCCodeGenerator var: #ceGetSP declareC: 'unsigned long (*ceGetSP)(void)'; var: #ceCaptureCStackPointers declareC: 'void (*ceCaptureCStackPointers)(void)'; var: #ceEnterCogCodePopReceiverReg declareC: 'void (*ceEnterCogCodePopReceiverReg)(void)'; var: #realCEEnterCogCodePopReceiverReg declareC: 'void (*realCEEnterCogCodePopReceiverReg)(void)'; var: #ceEnterCogCodePopReceiverAndClassRegs declareC: 'void (*ceEnterCogCodePopReceiverAndClassRegs)(void)'; var: #realCEEnterCogCodePopReceiverAndClassRegs declareC: 'void (*realCEEnterCogCodePopReceiverAndClassRegs)(void)'; var: #ceFlushICache declareC: 'static void (*ceFlushICache)(unsigned long from, unsigned long to)'; var: #ceCheckFeaturesFunction declareC: 'static unsigned long (*ceCheckFeaturesFunction)(void)'; var: #ceTryLockVMOwner declareC: 'unsigned long (*ceTryLockVMOwner)(void)'; var: #ceUnlockVMOwner declareC: 'void (*ceUnlockVMOwner)(void)'; var: #postCompileHook declareC: 'void (*postCompileHook)(CogMethod *, void *)'; var: #openPICList declareC: 'CogMethod *openPICList = 0'; var: #maxMethodBefore type: #'CogBlockMethod *'. aCCodeGenerator declareVar: 'aMethodLabel' type: #'AbstractInstruction'; "Has to come lexicographically before backEnd & methodLabel" var: #backEnd declareC: 'AbstractInstruction * const backEnd = &aMethodLabel'; var: #methodLabel declareC: 'AbstractInstruction * const methodLabel = &aMethodLabel'; var: #primInvokeLabel type: #'AbstractInstruction *'. self declareC: #(abstractOpcodes stackCheckLabel blockEntryLabel blockEntryNoContextSwitch stackOverflowCall sendMissCall entry noCheckEntry dynSuperEntry mnuCall interpretCall endCPICCase0 endCPICCase1) as: #'AbstractInstruction *' in: aCCodeGenerator. aCCodeGenerator declareVar: #annotations type: #'InstructionAnnotation *'; declareVar: #blockStarts type: #'BlockStart *'; declareVar: #fixups type: #'BytecodeFixup *'. aCCodeGenerator var: #sendTrampolines declareC: 'sqInt sendTrampolines[NumSendTrampolines]'; var: #superSendTrampolines declareC: 'sqInt superSendTrampolines[NumSendTrampolines]'; var: #dynamicSuperSendTrampolines declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]'; var: #trampolineAddresses declareC: 'static char *trampolineAddresses[NumTrampolines*2]'; var: #objectReferencesInRuntime declareC: 'static sqInt objectReferencesInRuntime[NumObjRefsInRuntime]'; var: #cePositive32BitIntegerTrampoline declareC: 'static sqInt cePositive32BitIntegerTrampoline'; var: #labelCounter + type: #int; - declareC: 'static int labelCounter'; var: #traceFlags declareC: 'int traceFlags = 8 /* prim trace log on by default */'; var: #cStackAlignment declareC: 'const int cStackAlignment = STACK_ALIGN_BYTES'. aCCodeGenerator declareVar: #CFramePointer type: #'void *'; declareVar: #CStackPointer type: #'void *'; declareVar: #minValidCallAddress type: #'unsigned long'; declareVar: #debugPrimCallStackOffset type: #'unsigned long'. aCCodeGenerator var: #generatorTable declareC: 'BytecodeDescriptor generatorTable[', aCCodeGenerator vmClass generatorTable size, ']' , (self tableInitializerFor: aCCodeGenerator vmClass generatorTable in: aCCodeGenerator); var: #primitiveGeneratorTable declareC: 'PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1]' , (self tableInitializerFor: aCCodeGenerator vmClass primitiveTable in: aCCodeGenerator). "In C the abstract opcode names clash with the Smalltak generator syntactic sugar. Most of the syntactic sugar is inlined, but alas some remains. Rename the syntactic sugar to avoid the clash." (self organization listAtCategoryNamed: #'abstract instructions') do: [:s| aCCodeGenerator addSelectorTranslation: s to: 'g', (aCCodeGenerator cFunctionNameFor: s)]. aCCodeGenerator addSelectorTranslation: #halt: to: 'haltmsg'! Item was changed: ----- Method: Cogit class>>mustBeGlobal: (in category 'translation') ----- mustBeGlobal: var "Answer if a variable must be global and exported. Used for inst vars that are accessed from VM support code. include cePositive32BitIntegerTrampoline as a hack to prevent it being inlined (it is + only used outside of Cogit by the object representation). Include CFramePointer CStackPointer as + a hack to get them declared at all." - only used outside of Cogit by the object representation). Include labelCounter as a hack to stop it - being inlined into genLabel, and CFramePointer CStackPointer as a hack to get them declared at all." ^#('ceBaseFrameReturnTrampoline' 'ceCaptureCStackPointers' 'ceCheckForInterruptTrampoline' 'ceEnterCogCodePopReceiverReg' 'realCEEnterCogCodePopReceiverReg' 'ceEnterCogCodePopReceiverAndClassRegs' 'realCEEnterCogCodePopReceiverAndClassRegs' 'ceReturnToInterpreterTrampoline' 'ceCannotResumeTrampoline' + 'ceTryLockVMOwner' 'ceUnlockVMOwner' - 'cePositive32BitIntegerTrampoline' 'ceFlushICache' 'ceTryLockVMOwner' 'ceUnlockVMOwner' 'cmEntryOffset' 'cmNoCheckEntryOffset' 'cmDynSuperEntryOffset' 'blockNoContextSwitchOffset' 'breakPC' + 'CFramePointer' 'CStackPointer' 'cFramePointerInUse' 'ceGetSP' - 'labelCounter' 'CFramePointer' 'CStackPointer' 'cFramePointerInUse' 'ceGetSP' 'traceFlags' 'traceStores' 'debugPrimCallStackOffset') includes: var! Item was added: + ----- Method: Cogit>>followForwardedLiteralsIn: (in category 'garbage collection') ----- + followForwardedLiteralsIn: cogMethod + <api> + <option: #SpurObjectMemory> + <var: #cogMethod type: #'CogMethod *'> + self assert: (objectMemory shouldRemapOop: cogMethod methodObject) not. + (objectMemory shouldRemapOop: cogMethod selector) ifTrue: + [cogMethod selector: (objectMemory remapObj: cogMethod selector)]. + self mapFor: cogMethod + performUntil: (self cppIf: NewspeakVM + ifTrue: [#remapNSIfObjectRef:pc:hasYoung:] + ifFalse: [#remapIfObjectRef:pc:hasYoung:]) + arg: 0! Item was added: + ----- Method: Cogit>>followForwardedMethods (in category 'garbage collection') ----- + followForwardedMethods + <api> + <option: #SpurObjectMemory> + <var: #cogMethod type: #'CogMethod *'> + | cogMethod freedPIC | + <var: #cogMethod type: #'CogMethod *'> + freedPIC := false. + cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. + [cogMethod < methodZone limitZony] whileTrue: + [cogMethod cmType = CMMethod ifTrue: + [(objectMemory shouldRemapOop: cogMethod methodObject) ifTrue: + [cogMethod methodObject: (objectMemory remapObj: cogMethod methodObject). + (cogMethod cmRefersToYoung not + and: [objectMemory isYoungObject: cogMethod methodObject]) ifTrue: + [methodZone addToYoungReferrers: cogMethod methodObject]]]. + cogMethod cmType = CMClosedPIC ifTrue: + [(self mapObjectReferencesInClosedPIC: cogMethod) ifTrue: + [freedPIC := true. + methodZone freeMethod: cogMethod]]. + cogMethod := methodZone methodAfter: cogMethod]. + freedPIC ifTrue: + [self unlinkSendsToFree. + processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]! Item was changed: ----- Method: ObjectMemory class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator + self declareCAsOop: + #( memory endOfMemory memoryLimit + youngStart youngStartLocal freeBlock + compStart compEnd + fwdTableNext fwdTableLast + gcBiasToGrowThreshold ) + in: aCCodeGenerator. + self declareCAsUSqLong: + #( gcStartUsecs statFullGCUsecs statIncrGCUsecs statIGCDeltaUsecs ) + in: aCCodeGenerator. aCCodeGenerator - var: #memory - declareC: 'static usqInt memory'. - aCCodeGenerator var: #remapBuffer declareC: 'sqInt remapBuffer[RemapBufferSize + 1 /* ', (RemapBufferSize + 1) printString, ' */]'. aCCodeGenerator var: #rootTable declareC: 'sqInt rootTable[RootTableSize + 1 /* ', (RootTableSize + 1) printString, ' */]'. "Weak roots must be large enough for roots+remapBuffer+sizeof(allCallsOn: #markAndTrace:)" aCCodeGenerator var: #weakRoots declareC: 'sqInt weakRoots[WeakRootTableSize + 1 /* ', (WeakRootTableSize + 1) printString, ' */]'. aCCodeGenerator var: #headerTypeBytes declareC: 'sqInt headerTypeBytes[4]'. aCCodeGenerator var: #extraRoots declareC: 'sqInt* extraRoots[ExtraRootSize + 1 /* ', (ExtraRootSize + 1) printString, ' */]'. - self declareCAsOop: { - #youngStart . - #endOfMemory . - #memoryLimit . - #youngStartLocal . - #freeBlock . - #compStart . - #compEnd . - #fwdTableNext . - #fwdTableLast . - #gcBiasToGrowThreshold } - in: aCCodeGenerator. aCCodeGenerator + var: #headerTypeBytes type: 'const sqInt' array: HeaderTypeExtraBytes! - var: #headerTypeBytes type: 'const sqInt' array: HeaderTypeExtraBytes. - self declareCAsUSqLong: #(gcStartUsecs statFullGCUsecs statIncrGCUsecs statIGCDeltaUsecs) - in: aCCodeGenerator! Item was changed: ----- Method: ObjectMemory class>>mustBeGlobal: (in category 'translation') ----- mustBeGlobal: var "Answer if a variable must be global and exported. Used for inst vars that are accessed from VM support code." + ^false "used to be: ^'memory' = var"! - ^'memory' = var! Item was changed: ----- Method: ObjectMemory>>isOopForwarded: (in category 'interpreter access') ----- isOopForwarded: oop "Compatibility wth SpurMemoryManager. In ObjectMemory, no forwarding pointers are visible to the VM." - <api> - <cmacro: '(oop) false'> <inline: true> ^false! Item was changed: ----- Method: SimpleStackBasedCogit>>genPushLiteralVariable: (in category 'bytecode generators') ----- genPushLiteralVariable: literalIndex <inline: false> | association | association := self getLiteral: literalIndex. "N.B. Do _not_ use ReceiverResultReg to avoid overwriting receiver in assignment in frameless methods." self annotate: (self MoveCw: association R: ClassReg) objRef: association. - objectRepresentation genEnsureRegNotForwarded: ClassReg scratchReg: TempReg. objectRepresentation + genEnsureObjInRegRegNotForwarded: ClassReg + scratchReg: TempReg. + objectRepresentation genLoadSlot: ValueIndex sourceReg: ClassReg destReg: TempReg. self PushR: TempReg. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genSpecialSelectorEqualsEquals (in category 'bytecode generators') ----- genSpecialSelectorEqualsEquals | jumpNotEqual jumpPush | <var: #jumpNotEqual type: #'AbstractInstruction *'> <var: #jumpPush type: #'AbstractInstruction *'> + self PopR: Arg0Reg. + objectRepresentation + genEnsureObjInRegRegNotForwarded: Arg0Reg + scratchReg: TempReg. - self PopR: TempReg. self MoveMw: 0 r: SPReg R: ClassReg. + objectRepresentation + genEnsureObjInRegRegNotForwarded: ClassReg + scratchReg: TempReg. + self CmpR: Arg0Reg R: ClassReg. - self CmpR: TempReg R: ClassReg. jumpNotEqual := self JumpNonZero: 0. + self annotate: (self MoveCw: objectMemory trueObject R: Arg0Reg) - self annotate: (self MoveCw: objectMemory trueObject R: TempReg) objRef: objectMemory trueObject. jumpPush := self Jump: 0. + jumpNotEqual jmpTarget: (self annotate: (self MoveCw: objectMemory falseObject R: Arg0Reg) - jumpNotEqual jmpTarget: (self annotate: (self MoveCw: objectMemory falseObject R: TempReg) objRef: objectMemory falseObject). + jumpPush jmpTarget: (self MoveR: Arg0Reg Mw: 0 r: SPReg). - jumpPush jmpTarget: (self MoveR: TempReg Mw: 0 r: SPReg). ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genStorePop:LiteralVariable: (in category 'bytecode generators') ----- genStorePop: popBoolean LiteralVariable: litVarIndex <inline: false> | association | self assert: needsFrame. association := self getLiteral: litVarIndex. self annotate: (self MoveCw: association R: ReceiverResultReg) objRef: association. + objectRepresentation + genEnsureObjInRegRegNotForwarded: ReceiverResultReg + scratchReg: TempReg. - objectRepresentation genEnsureRegNotForwarded: ReceiverResultReg scratchReg: TempReg. popBoolean ifTrue: [self PopR: ClassReg] ifFalse: [self MoveMw: 0 r: SPReg R: ClassReg]. traceStores > 0 ifTrue: [self CallRT: ceTraceStoreTrampoline]. ^objectRepresentation genStoreSourceReg: ClassReg slotIndex: ValueIndex destReg: ReceiverResultReg scratchReg: TempReg! Item was changed: ----- Method: Spur32BitCoMemoryManager>>startOfMemory (in category 'accessing') ----- startOfMemory "Return the start of object memory. This is immediately after the native code zone. N.B. the stack zone is alloca'ed. Use a macro so as not to punish the debug VM." + <api> <cmacro: '() heapBase'> <returnTypeC: #usqInt> ^coInterpreter heapBase! Item was changed: ----- Method: SpurMemoryManager>>scavengingGCTenuringIf: (in category 'gc - scavenging') ----- scavengingGCTenuringIf: tenuringCriterion "Run the scavenger." self assert: remapBufferCount = 0. + (self asserta: scavenger eden limit - freeStart > coInterpreter interpreterAllocationReserveBytes) ifFalse: + [coInterpreter tab; + printNum: scavenger eden limit - freeStart; space; + printNum: coInterpreter interpreterAllocationReserveBytes; space; + printNum: coInterpreter interpreterAllocationReserveBytes - (scavenger eden limit - freeStart); cr]. - self assert: scavenger eden limit - freeStart > coInterpreter interpreterAllocationReserveBytes. self checkMemoryMap. self checkFreeSpace. "coInterpreter printCallStackFP: coInterpreter framePointer" self runLeakCheckerForFullGC: false. coInterpreter preGCAction: GCModeScavenge; "would prefer this to be in mapInterpreterOops, but compatibility with ObjectMemory dictates it goes here." flushMethodCacheFrom: newSpaceStart to: newSpaceLimit. needGCFlag := false. gcStartUsecs := coInterpreter ioUTCMicrosecondsNow. self doScavenge: tenuringCriterion. statScavenges := statScavenges + 1. statGCEndUsecs := coInterpreter ioUTCMicrosecondsNow. statSGCDeltaUsecs := statGCEndUsecs - gcStartUsecs. statScavengeGCUsecs := statScavengeGCUsecs + statSGCDeltaUsecs. statRootTableCount := scavenger rememberedSetSize. coInterpreter postGCAction: GCModeScavenge. self runLeakCheckerForFullGC: false. self checkFreeSpace! Item was changed: ----- Method: StackInterpreter>>findNewMethodInClassTag: (in category 'message sending') ----- findNewMethodInClassTag: classTagArg "Find the compiled method to be run when the current messageSelector is sent to the given class, setting the values of 'newMethod' and 'primitiveIndex'." | ok class classTag | <inline: false> ok := self lookupInMethodCacheSel: messageSelector classTag: classTagArg. ok ifFalse: "entry was not found in the cache; look it up the hard way " [classTag := classTagArg. ((objectMemory isOopForwarded: messageSelector) or: [objectMemory isForwardedClassTag: classTag]) ifTrue: [(objectMemory isOopForwarded: messageSelector) ifTrue: [messageSelector := self handleForwardedSelectorFaultFor: messageSelector]. (objectMemory isForwardedClassTag: classTag) ifTrue: + [classTag := self handleForwardedSendFaultForTag: classTag]. - [classTag := self handleForwardedSendFaultFor: classTag]. ok := self lookupInMethodCacheSel: messageSelector classTag: classTag. ok ifTrue: [^nil]]. class := objectMemory classForClassTag: classTag. self lookupMethodInClass: class. self addNewMethodToCache: class]! Item was added: + ----- Method: StackInterpreter>>followForwardedFieldsInCurrentMethod (in category 'message sending') ----- + followForwardedFieldsInCurrentMethod + objectMemory + followForwardedObjectFields: method + toDepth: 0! Item was added: + ----- Method: StackInterpreter>>followForwardedMethods (in category 'object memory support') ----- + followForwardedMethods + "This is just a stub for the CoInterpreter"! Item was added: + ----- Method: StackInterpreter>>followForwardedMethodsInMethodCache (in category 'object memory support') ----- + followForwardedMethodsInMethodCache + 0 to: MethodCacheSize - 1 by: MethodCacheEntrySize do: + [:i | | c s m | + c := methodCache at: i + MethodCacheClass. + s := methodCache at: i + MethodCacheSelector. + m := methodCache at: i + MethodCacheMethod. + (c ~= 0 and: [s ~= 0 and: [m ~= 0 + and: [objectMemory isOopForwarded: m]]]) ifTrue: + [m := objectMemory followForwarded: m. + methodCache at: i + MethodCacheMethod put: m]]! Item was changed: ----- Method: StackInterpreter>>handleForwardedSelectorFaultFor: (in category 'message sending') ----- handleForwardedSelectorFaultFor: selectorOop "Handle a send fault that is due to a send using a forwarded selector. Unforward the selector and follow the current method and special selectors array to unforward the source of the forwarded selector." + <option: #SpurObjectMemory> <inline: false> self assert: (objectMemory isOopForwarded: selectorOop). + self followForwardedFieldsInCurrentMethod. - objectMemory - followForwardedObjectFields: method - toDepth: 0; followForwardedObjectFields: (objectMemory splObj: SpecialSelectors) + toDepth: 0. - toDepth: 0. ^objectMemory followForwarded: selectorOop! Item was removed: - ----- Method: StackInterpreter>>handleForwardedSendFaultFor: (in category 'message sending') ----- - handleForwardedSendFaultFor: classTag - "Handle a send fault that may be due to a send to a forwarded object. - Unforward the receiver on the stack and answer its actual class." - | rcvr | - <inline: false> - self assert: (objectMemory isForwardedClassTag: classTag). - - rcvr := self stackValue: argumentCount. - "should *not* be a super send, so the receiver should be forwarded." - self assert: (objectMemory isOopForwarded: rcvr). - rcvr := objectMemory followForwarded: rcvr. - self stackValue: argumentCount put: rcvr. - self followForwardedFrameContents: framePointer - stackPointer: stackPointer + (argumentCount + 1 * BytesPerWord). "don't repeat effort" - (objectMemory isPointers: (self frameReceiver: framePointer)) ifTrue: - [objectMemory - followForwardedObjectFields: (self frameReceiver: framePointer) - toDepth: 0]. - ^objectMemory fetchClassTagOf: rcvr! Item was added: + ----- Method: StackInterpreter>>handleForwardedSendFaultForTag: (in category 'message sending') ----- + handleForwardedSendFaultForTag: classTag + "Handle a send fault that may be due to a send to a forwarded object. + Unforward the receiver on the stack and answer its actual class." + <option: #SpurObjectMemory> + | rcvr | + <inline: false> + self assert: (objectMemory isForwardedClassTag: classTag). + + rcvr := self stackValue: argumentCount. + "should *not* be a super send, so the receiver should be forwarded." + self assert: (objectMemory isOopForwarded: rcvr). + rcvr := objectMemory followForwarded: rcvr. + self stackValue: argumentCount put: rcvr. + self followForwardedFrameContents: framePointer + stackPointer: stackPointer + (argumentCount + 1 * BytesPerWord). "don't repeat effort" + (objectMemory isPointers: (self frameReceiver: framePointer)) ifTrue: + [objectMemory + followForwardedObjectFields: (self frameReceiver: framePointer) + toDepth: 0]. + ^objectMemory fetchClassTagOf: rcvr! Item was changed: ----- Method: StackInterpreter>>internalFindNewMethod (in category 'message sending') ----- internalFindNewMethod "Find the compiled method to be run when the current messageSelector is sent to the class 'lkupClass', setting the values of 'newMethod' and 'primitiveIndex'." | ok | <inline: true> ok := self lookupInMethodCacheSel: messageSelector classTag: lkupClassTag. ok ifFalse: "entry was not found in the cache; look it up the hard way" [self externalizeIPandSP. ((objectMemory isOopForwarded: messageSelector) or: [objectMemory isForwardedClassTag: lkupClassTag]) ifTrue: [(objectMemory isOopForwarded: messageSelector) ifTrue: [messageSelector := self handleForwardedSelectorFaultFor: messageSelector]. (objectMemory isForwardedClassTag: lkupClassTag) ifTrue: + [lkupClassTag := self handleForwardedSendFaultForTag: lkupClassTag]. - [lkupClassTag := self handleForwardedSendFaultFor: lkupClassTag]. ok := self lookupInMethodCacheSel: messageSelector classTag: lkupClassTag. ok ifTrue: [^nil]]. lkupClass := objectMemory classForClassTag: lkupClassTag. self lookupMethodInClass: lkupClass. self internalizeIPandSP. self addNewMethodToCache: lkupClass]! Item was changed: ----- Method: StackInterpreter>>postBecomeAction: (in category 'object memory support') ----- postBecomeAction: theBecomeEffectsFlags theBecomeEffectsFlags ~= 0 ifTrue: [self followForwardingPointersInStackZone: theBecomeEffectsFlags. + (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: + [self followForwardedMethodsInMethodCache]. + self followForwardedMethods. "for CoInterpreter" self followForwardingPointersInScheduler]! Item was changed: ----- Method: StackInterpreter>>printOopShortInner: (in category 'debug printing') ----- printOopShortInner: oop | classOop name nameLen | <var: #name type: #'char *'> <inline: true> (objectMemory isImmediate: oop) ifTrue: [(objectMemory isImmediateCharacter: oop) ifTrue: [^self printChar: $$; printChar: (objectMemory characterValueOf: oop); printChar: $(; printHex: (objectMemory integerValueOf: oop); printChar: $)]. ^self printNum: (objectMemory integerValueOf: oop); printChar: $(; printHex: (objectMemory integerValueOf: oop); printChar: $)]. (objectMemory addressCouldBeObj: oop) ifFalse: [^self print: ((oop bitAnd: objectMemory allocationUnit - 1) ~= 0 ifTrue: [' is misaligned'] ifFalse: [' is not on the heap'])]. + (objectMemory isOopForwarded: oop) ifTrue: + [^self printHex: oop; print: ' is a forwarder to '; printHex: (objectMemory followForwarded: oop)]. (self isFloatObject: oop) ifTrue: [^self printFloat: (self 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 str: name n: 'ByteString' cmp: 10) not "strncmp is weird" ifTrue: [^self printChar: $'; printStringOf: oop; printChar: $']. (self str: name n: 'ByteSymbol' cmp: 10) not "strncmp is weird" ifTrue: [self printChar: $#; printStringOf: oop. ^self]]. (nameLen = 9 and: [(self str: name n: 'Character' cmp: 9) not]) ifTrue: [^self printChar: $$; printChar: (objectMemory integerValueOf: (objectMemory fetchPointer: 0 ofObject: oop))]. self print: 'a(n) '. self cCode: [0 to: nameLen - 1 do: [:i| self printChar: (name at: i)]] inSmalltalk: [name isString ifTrue: [self print: name] ifFalse: [0 to: nameLen - 1 do: [:i| self printChar: (name at: i)]]]. "Try to spot association-like things; they're all subclasses of LookupKey" ((objectMemory instanceSizeOf: classOop) = (ValueIndex + 1) and: [(self superclassOf: classOop) = (self superclassOf: (objectMemory fetchClassOfNonImm: (objectMemory splObj: SchedulerAssociation))) and: [objectMemory isBytes: (objectMemory fetchPointer: KeyIndex ofObject: oop)]]) ifTrue: [self space; printOopShort: (objectMemory fetchPointer: KeyIndex ofObject: oop); print: ' -> '; printHex: (objectMemory fetchPointer: ValueIndex ofObject: oop)]! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPushLiteralVariable: (in category 'bytecode generators') ----- genPushLiteralVariable: literalIndex <inline: false> | association freeReg | freeReg := self ssAllocatePreferredReg: ClassReg. association := self getLiteral: literalIndex. "N.B. Do _not_ use ReceiverResultReg to avoid overwriting receiver in assignment in frameless methods." "So far descriptors are not rich enough to describe the entire dereference so generate the register load but don't push the result. There is an order-of-evaluation issue if we defer the dereference." self annotate: (self MoveCw: association R: TempReg) objRef: association. - objectRepresentation genEnsureRegNotForwarded: TempReg scratchReg: freeReg. objectRepresentation + genEnsureObjInRegRegNotForwarded: TempReg + scratchReg: freeReg. + objectRepresentation genLoadSlot: ValueIndex sourceReg: TempReg destReg: freeReg. self ssPushRegister: freeReg. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genStorePop:LiteralVariable: (in category 'bytecode generators') ----- genStorePop: popBoolean LiteralVariable: litVarIndex <inline: false> | topReg valueReg association constVal | self flag: 'with better register allocation this wouldn''t need a frame. e.g. use SendNumArgs instead of ReceiverResultReg'. self assert: needsFrame. optStatus isReceiverResultRegLive: false. "N.B. No need to check the stack for references because we generate code for literal variable loads that stores the result in a register, deferring only the register push." association := self getLiteral: litVarIndex. constVal := self ssTop maybeConstant. "Avoid store check for immediate values" (self ssTop type = SSConstant and: [(objectRepresentation shouldAnnotateObjectReference: constVal) not]) ifTrue: [self ssAllocateRequiredReg: ReceiverResultReg. self annotate: (self MoveCw: association R: ReceiverResultReg) objRef: association. + objectRepresentation + genEnsureObjInRegRegNotForwarded: ReceiverResultReg + scratchReg: TempReg. - objectRepresentation genEnsureRegNotForwarded: ReceiverResultReg scratchReg: TempReg. self ssStorePop: popBoolean toPreferredReg: TempReg. traceStores > 0 ifTrue: [self CallRT: ceTraceStoreTrampoline]. ^objectRepresentation genStoreImmediateInSourceReg: TempReg slotIndex: ValueIndex destReg: ReceiverResultReg]. ((topReg := self ssTop registerOrNil) isNil or: [topReg = ReceiverResultReg]) ifTrue: [topReg := ClassReg]. self ssPop: 1. self ssAllocateCallReg: topReg. "for the ceStoreCheck call in genStoreSourceReg:... below" self ssPush: 1. valueReg := self ssStorePop: popBoolean toPreferredReg: topReg. valueReg = ReceiverResultReg ifTrue: [self MoveR: valueReg R: topReg]. self ssAllocateCallReg: ReceiverResultReg. self annotate: (self MoveCw: association R: ReceiverResultReg) objRef: association. + objectRepresentation genEnsureObjInRegRegNotForwarded: ReceiverResultReg scratchReg: TempReg. - objectRepresentation genEnsureRegNotForwarded: ReceiverResultReg scratchReg: TempReg. traceStores > 0 ifTrue: [self MoveR: topReg R: TempReg. self CallRT: ceTraceStoreTrampoline]. ^objectRepresentation genStoreSourceReg: topReg slotIndex: ValueIndex destReg: ReceiverResultReg scratchReg: TempReg!

1 0

VM Maker: VMMaker.oscog-eem.546.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.546.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.546 Author: eem Time: 6 December 2013, 2:53:39.599 pm UUID: d745c2ec-3cc8-4612-9ff5-0c85fe771ced Ancestors: VMMaker.oscog-eem.545 Rename the three genConvertFooToBarInScratchReg:'s to genConvertFooToBarInReg: =============== Diff against VMMaker.oscog-eem.545 =============== Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>genConvertIntegerToSmallIntegerInReg: (in category 'compile abstract instructions') ----- + genConvertIntegerToSmallIntegerInReg: reg + cogit LogicalShiftLeftCq: 1 R: reg. + cogit AddCq: 1 R: reg. + ^0! Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>genConvertSmallIntegerToIntegerInReg: (in category 'compile abstract instructions') ----- + genConvertSmallIntegerToIntegerInReg: reg + cogit ArithmeticShiftRightCq: 1 R: reg. + ^0! Item was removed: - ----- Method: CogObjectRepresentationFor32BitSpur>>genConvertSmallIntegerToIntegerInScratchReg: (in category 'compile abstract instructions') ----- - genConvertSmallIntegerToIntegerInScratchReg: scratchReg - cogit ArithmeticShiftRightCq: 1 R: scratchReg. - ^0! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>genGetHashFieldNonImmOf:asSmallIntegerInto: (in category 'compile abstract instructions') ----- genGetHashFieldNonImmOf: instReg asSmallIntegerInto: destReg "Fetch the instance's identity hash into destReg, encoded as a SmallInteger." "Get header word in scratchReg" cogit MoveMw: 4 r: instReg R: destReg. "Shift and mask the field leaving room for the SmallInteger tag." cogit AndCq: objectMemory identityHashHalfWordMask R: destReg. + self genConvertIntegerToSmallIntegerInReg: destReg. - self genConvertIntegerToSmallIntegerInScratchReg: destReg. ^0! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>genGetSizeOf:into:formatReg:scratchReg:abortJumpsInto: (in category 'primitive generators') ----- genGetSizeOf: sourceReg into: destReg formatReg: formatReg scratchReg: scratchReg abortJumpsInto: aBinaryBlock "Get the size of the non-immediate object in sourceReg into destReg using formatReg and scratchReg as temps. None of these registers can overlap. Supply the jumps taken if the object in sourceReg is not indexable, or if the object in sourceReg is a context.. Hack: If the object has a pointer format other than 2 leave the number of fixed fields in formatReg. Used by primitiveSize, primitiveAt, and primitiveAtPut" <returnTypeC: #'AbstractInstruction *'> | jumpNotIndexable jumpSmallSize jumpBytesDone jumpShortsDone jumpArrayDone jump32BitLongsDone jumpIsBytes jumpHasFixedFields jumpIsShorts jumpIsContext | <inline: true> "c.f. StackInterpreter>>stSizeOf: SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:" <var: #jumpIsBytes type: #'AbstractInstruction *'> <var: #jumpIsShorts type: #'AbstractInstruction *'> <var: #jumpSmallSize type: #'AbstractInstruction *'> <var: #jumpIsContext type: #'AbstractInstruction *'> <var: #jumpArrayDone type: #'AbstractInstruction *'> <var: #jumpNotIndexable type: #'AbstractInstruction *'> <var: #jumpHasFixedFields type: #'AbstractInstruction *'> <var: #jump32BitLongsDone type: #'AbstractInstruction *'> cogit MoveMw: 0 r: sourceReg R: formatReg; "formatReg := least significant half of self baseHeader: receiver" MoveR: formatReg R: scratchReg; LogicalShiftRightCq: objectMemory formatShift R: formatReg; AndCq: objectMemory formatMask R: formatReg. "formatReg := self formatOfHeader: destReg" "get numSlots into destReg." cogit MoveCq: 0 R: destReg. "N.B. MoveMb:r:R: does not zero other bits" cogit MoveMb: 7 r: sourceReg R: destReg. "MSB of header" cogit CmpCq: objectMemory numSlotsMask R: destReg. jumpSmallSize := cogit JumpLess: 0. cogit MoveMw: -8 r: sourceReg R: destReg. "LSW of overflow size header" "dispatch on format in a combination of highest dynamic frequency order first and convenience. 0 = 0 sized objects (UndefinedObject True False et al) 1 = non-indexable objects with inst vars (Point et al) 2 = indexable objects with no inst vars (Array et al) 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) 4 = weak indexable objects with inst vars (WeakArray et al) 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) 6 unused, reserved for exotic pointer objects? 7 Forwarded Object, 1st field is pointer, rest of fields are ignored 8 unused, reserved for exotic non-pointer objects? 9 (?) 64-bit indexable 10 - 11 32-bit indexable 12 - 15 16-bit indexable 16 - 23 byte indexable 24 - 31 compiled method" jumpSmallSize jmpTarget: (cogit CmpCq: objectMemory firstByteFormat R: formatReg). jumpIsBytes := cogit JumpGreaterOrEqual: 0. cogit CmpCq: objectMemory arrayFormat R: formatReg. jumpArrayDone := cogit JumpZero: 0. jumpNotIndexable := cogit JumpLess: 0. cogit CmpCq: objectMemory weakArrayFormat R: formatReg. jumpHasFixedFields := cogit JumpLessOrEqual: 0. cogit CmpCq: objectMemory firstShortFormat R: formatReg. jumpIsShorts := cogit JumpGreaterOrEqual: 0. cogit CmpCq: objectMemory firstLongFormat R: formatReg. jump32BitLongsDone := cogit JumpGreaterOrEqual: 0. "For now ignore 64-bit indexability." jumpNotIndexable jmpTarget: cogit Label. jumpNotIndexable := cogit Jump: 0. jumpIsBytes jmpTarget: (cogit LogicalShiftLeftCq: objectMemory shiftForWord R: destReg). cogit AndCq: objectMemory wordSize - 1 R: formatReg. cogit SubR: formatReg R: destReg. jumpBytesDone := cogit Jump: 0. jumpIsShorts jmpTarget: (cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: destReg). cogit AndCq: 1 R: formatReg. cogit SubR: formatReg R: destReg. jumpShortsDone := cogit Jump: 0. "formatReg contains fmt, now up for grabs. destReg contains numSlots, precious. sourceReg must be preserved" jumpHasFixedFields jmpTarget: (cogit AndCq: objectMemory classIndexMask R: scratchReg). cogit MoveR: scratchReg R: formatReg. cogit CmpCq: ClassMethodContextCompactIndex R: scratchReg. jumpIsContext := cogit JumpZero: 0. cogit PushR: destReg. self genGetClassObjectOfClassIndex: formatReg into: destReg scratchReg: scratchReg. self genLoadSlot: InstanceSpecificationIndex sourceReg: destReg destReg: formatReg. + self genConvertSmallIntegerToIntegerInReg: formatReg. - self genConvertSmallIntegerToIntegerInScratchReg: formatReg. cogit PopR: destReg; AndCq: objectMemory fixedFieldsOfClassFormatMask R: formatReg; SubR: formatReg R: destReg. jumpArrayDone jmpTarget: (jump32BitLongsDone jmpTarget: (jumpShortsDone jmpTarget: (jumpBytesDone jmpTarget: cogit Label))). aBinaryBlock value: jumpNotIndexable value: jumpIsContext! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>genInnerPrimitiveAt: (in category 'primitive generators') ----- genInnerPrimitiveAt: retNoffset "Implement the guts of primitiveAt; dispatch on size" | formatReg jumpNotIndexable jumpSmallSize jumpImmediate jumpBadIndex jumpBytesDone jumpShortsDone jumpWordsDone jumpFixedFieldsDone jumpIsBytes jumpIsShorts jumpIsWords jumpWordTooBig jumpIsArray jumpHasFixedFields jumpIsContext jumpBytesOutOfBounds jumpShortsOutOfBounds jumpWordsOutOfBounds jumpArrayOutOfBounds jumpFixedFieldsOutOfBounds | <inline: true> "c.f. StackInterpreter>>stSizeOf: SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:" <var: #jumpIsBytes type: #'AbstractInstruction *'> <var: #jumpIsShorts type: #'AbstractInstruction *'> <var: #jumpBadIndex type: #'AbstractInstruction *'> <var: #jumpSmallSize type: #'AbstractInstruction *'> <var: #jumpIsContext type: #'AbstractInstruction *'> <var: #jumpImmediate type: #'AbstractInstruction *'> <var: #jumpBytesDone type: #'AbstractInstruction *'> <var: #jumpShortsDone type: #'AbstractInstruction *'> <var: #jumpWordsDone type: #'AbstractInstruction *'> <var: #jumpWordTooBig type: #'AbstractInstruction *'> <var: #jumpNotIndexable type: #'AbstractInstruction *'> <var: #jumpHasFixedFields type: #'AbstractInstruction *'> <var: #jumpFixedFieldsDone type: #'AbstractInstruction *'> <var: #jumpArrayOutOfBounds type: #'AbstractInstruction *'> <var: #jumpBytesOutOfBounds type: #'AbstractInstruction *'> <var: #jumpShortsOutOfBounds type: #'AbstractInstruction *'> <var: #jumpWordsOutOfBounds type: #'AbstractInstruction *'> <var: #jumpFixedFieldsOutOfBounds type: #'AbstractInstruction *'> cogit MoveR: ReceiverResultReg R: TempReg. jumpImmediate := self genJumpImmediateInScratchReg: TempReg. cogit MoveR: Arg0Reg R: TempReg. cogit MoveR: Arg0Reg R: Arg1Reg. jumpBadIndex := self genJumpNotSmallIntegerInScratchReg: TempReg. + self genConvertSmallIntegerToIntegerInReg: Arg1Reg. - self genConvertSmallIntegerToIntegerInScratchReg: Arg1Reg. cogit SubCq: 1 R: Arg1Reg. "1-rel => 0-rel" formatReg := SendNumArgsReg. cogit MoveMw: 0 r: ReceiverResultReg R: formatReg; "formatReg := least significant half of self baseHeader: receiver" MoveR: formatReg R: TempReg; LogicalShiftRightCq: objectMemory formatShift R: formatReg; AndCq: objectMemory formatMask R: formatReg. "formatReg := self formatOfHeader: destReg" "get numSlots into ClassReg." cogit MoveCq: 0 R: ClassReg. "N.B. MoveMb:r:R: does not zero other bits" cogit MoveMb: 7 r: ReceiverResultReg R: ClassReg. "MSB of header" cogit CmpCq: objectMemory numSlotsMask R: ClassReg. jumpSmallSize := cogit JumpLess: 0. cogit MoveMw: -8 r: ReceiverResultReg R: ClassReg. "LSW of overflow size header" "dispatch on format in a combination of highest dynamic frequency order first and convenience. 0 = 0 sized objects (UndefinedObject True False et al) 1 = non-indexable objects with inst vars (Point et al) 2 = indexable objects with no inst vars (Array et al) 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) 4 = weak indexable objects with inst vars (WeakArray et al) 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) 6 unused, reserved for exotic pointer objects? 7 Forwarded Object, 1st field is pointer, rest of fields are ignored 8 unused, reserved for exotic non-pointer objects? 9 (?) 64-bit indexable 10 - 11 32-bit indexable 12 - 15 16-bit indexable 16 - 23 byte indexable 24 - 31 compiled method" jumpSmallSize jmpTarget: (cogit CmpCq: objectMemory firstByteFormat R: formatReg). jumpIsBytes := cogit JumpGreaterOrEqual: 0. cogit CmpCq: objectMemory arrayFormat R: formatReg. jumpIsArray := cogit JumpZero: 0. jumpNotIndexable := cogit JumpLess: 0. cogit CmpCq: objectMemory weakArrayFormat R: formatReg. jumpHasFixedFields := cogit JumpLessOrEqual: 0. cogit CmpCq: objectMemory firstShortFormat R: formatReg. jumpIsShorts := cogit JumpGreaterOrEqual: 0. cogit CmpCq: objectMemory firstLongFormat R: formatReg. jumpIsWords := cogit JumpGreaterOrEqual: 0. "For now ignore 64-bit indexability." jumpNotIndexable jmpTarget: cogit Label. jumpNotIndexable := cogit Jump: 0. jumpIsBytes jmpTarget: (cogit LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg). cogit AndCq: objectMemory wordSize - 1 R: formatReg. cogit SubR: formatReg R: ClassReg; CmpR: Arg1Reg R: ClassReg. jumpBytesOutOfBounds := cogit JumpBelowOrEqual: 0. cogit AddCq: objectMemory baseHeaderSize R: Arg1Reg. cogit MoveXbr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. + self genConvertIntegerToSmallIntegerInReg: ReceiverResultReg. - self genConvertIntegerToSmallIntegerInScratchReg: ReceiverResultReg. jumpBytesDone := cogit Jump: 0. jumpIsShorts jmpTarget: (cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg). cogit AndCq: 1 R: formatReg. cogit SubR: formatReg R: ClassReg; CmpR: Arg1Reg R: ClassReg. jumpShortsOutOfBounds := cogit JumpBelowOrEqual: 0. cogit AddR: Arg1Reg R: ReceiverResultReg. cogit MoveM16: objectMemory baseHeaderSize r: ReceiverResultReg R: ReceiverResultReg. self genConvertIntegerToSmallIntegerInScratchReg: ReceiverResultReg. jumpShortsDone := cogit Jump: 0. jumpIsWords jmpTarget: (cogit CmpR: Arg1Reg R: ClassReg). jumpWordsOutOfBounds := cogit JumpBelowOrEqual: 0. cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg. cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: TempReg. cogit SubCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg. jumpWordTooBig := self jumpNotSmallIntegerUnsignedValueInRegister: TempReg. cogit MoveR: TempReg R: ReceiverResultReg. self genConvertIntegerToSmallIntegerInScratchReg: ReceiverResultReg. jumpWordsDone := cogit Jump: 0. jumpHasFixedFields jmpTarget: (cogit AndCq: objectMemory classIndexMask R: TempReg). cogit CmpCq: ClassMethodContextCompactIndex R: TempReg. cogit MoveR: TempReg R: formatReg. cogit CmpCq: ClassMethodContextCompactIndex R: TempReg. jumpIsContext := cogit JumpZero: 0. cogit PushR: ClassReg. self genGetClassObjectOfClassIndex: formatReg into: ClassReg scratchReg: TempReg. self genLoadSlot: InstanceSpecificationIndex sourceReg: ClassReg destReg: formatReg. cogit PopR: ClassReg. + self genConvertSmallIntegerToIntegerInReg: formatReg. - self genConvertSmallIntegerToIntegerInScratchReg: formatReg. cogit AndCq: objectMemory fixedFieldsOfClassFormatMask R: formatReg; SubR: formatReg R: ClassReg; CmpR: Arg1Reg R: ClassReg. jumpFixedFieldsOutOfBounds := cogit JumpBelowOrEqual: 0. "index is (formatReg (fixed fields) + Arg1Reg (0-rel index)) * wordSize + baseHeaderSize" cogit AddR: formatReg R: Arg1Reg. cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg. cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. jumpFixedFieldsDone := cogit Jump: 0. jumpIsArray jmpTarget: (cogit CmpR: Arg1Reg R: ClassReg). jumpArrayOutOfBounds := cogit JumpBelowOrEqual: 0. cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg. cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. jumpFixedFieldsDone jmpTarget: (jumpWordsDone jmpTarget: (jumpShortsDone jmpTarget: (jumpBytesDone jmpTarget: (cogit RetN: retNoffset)))). jumpFixedFieldsOutOfBounds jmpTarget: (jumpArrayOutOfBounds jmpTarget: (jumpBytesOutOfBounds jmpTarget: (jumpShortsOutOfBounds jmpTarget: (jumpWordsOutOfBounds jmpTarget: (jumpWordTooBig jmpTarget: (jumpNotIndexable jmpTarget: (jumpIsContext jmpTarget: (jumpBadIndex jmpTarget: (jumpImmediate jmpTarget: cogit Label))))))))). ^0! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>genInnerPrimitiveNew: (in category 'primitive generators') ----- genInnerPrimitiveNew: retNoffset "Implement primitiveNew for convenient cases: - the receiver has a hash - the receiver is fixed size (excluding ephemerons to save instructions & miniscule time) - single word header/num slots < numSlotsMask - the result fits in eden (actually below scavengeThreshold)" | halfHeaderReg fillReg instSpecReg byteSizeReg jumpUnhashed jumpVariableOrEphemeron jumpNoSpace jumpTooBig jumpHasSlots fillLoop skip | <var: 'skip' type: #'AbstractInstruction *'> <var: 'fillLoop' type: #'AbstractInstruction *'> <var: 'jumpTooBig' type: #'AbstractInstruction *'> <var: 'jumpHasSlots' type: #'AbstractInstruction *'> <var: 'jumpNoSpace' type: #'AbstractInstruction *'> <var: 'jumpUnhashed' type: #'AbstractInstruction *'> <var: 'jumpVariableOrEphemeron' type: #'AbstractInstruction *'> "half header will contain 1st half of header (classIndex/class's hash & format), then 2nd half of header (numSlots/fixed size) and finally fill value (nilObject)." halfHeaderReg := fillReg := SendNumArgsReg. "inst spec will hold class's instance specification, then byte size and finally end of new object." instSpecReg := byteSizeReg := ClassReg. "get freeStart as early as possible so as not to wait later..." cogit MoveAw: objectMemory freeStartAddress R: Arg1Reg. "get class's hash & fail if 0" self genGetHashFieldNonImmOf: ReceiverResultReg into: halfHeaderReg. jumpUnhashed := cogit JumpZero: 0. "get class's format inst var for both inst spec (format field) and num fixed fields" self genLoadSlot: InstanceSpecificationIndex sourceReg: ReceiverResultReg destReg: TempReg. + self genConvertSmallIntegerToIntegerInReg: TempReg. - self genConvertSmallIntegerToIntegerInScratchReg: TempReg. cogit MoveR: TempReg R: instSpecReg. cogit LogicalShiftRightCq: objectMemory fixedFieldsFieldWidth R: TempReg. cogit AndCq: objectMemory formatMask R: TempReg. cogit AndCq: objectMemory fixedFieldsOfClassFormatMask R: instSpecReg. "fail if not fixed or if ephemeron (rare beasts so save the cycles)" cogit CmpCq: objectMemory nonIndexablePointerFormat R: TempReg. jumpVariableOrEphemeron := cogit JumpAbove: 0. cogit CmpCq: objectMemory numSlotsMask R: instSpecReg. jumpTooBig := cogit JumpAboveOrEqual: 0. "Add format to classIndex/format half header; other word contains numSlots" cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg. cogit AddR: TempReg R: halfHeaderReg. "write half header now; it frees halfHeaderReg" cogit MoveR: halfHeaderReg Mw: 0 r: Arg1Reg. "save unrounded numSlots for header" cogit MoveR: instSpecReg R: halfHeaderReg. "compute byte size; remember 0-sized objects still need 1 slot & allocation is rounded up to 8 bytes." cogit CmpCq: 0 R: byteSizeReg. "a.k.a. instSpecReg" jumpHasSlots := cogit JumpNonZero: 0. cogit MoveCq: objectMemory baseHeaderSize * 2 R: byteSizeReg. skip := cogit Jump: 0. "round up to allocationUnit" jumpHasSlots jmpTarget: (cogit MoveR: byteSizeReg R: TempReg). cogit AndCq: 1 R: TempReg. cogit AddR: TempReg R: byteSizeReg. cogit AddCq: objectMemory baseHeaderSize / objectMemory wordSize R: byteSizeReg. cogit LogicalShiftLeftCq: objectMemory shiftForWord R: byteSizeReg. skip jmpTarget: "shift halfHeaderReg to put numSlots in correct place" (cogit LogicalShiftLeftCq: objectMemory numSlotsHalfShift R: halfHeaderReg). "check if allocation fits (freeSize + byteSize < scavengeThreshold); scavengeThreshold is constant." cogit AddR: Arg1Reg R: byteSizeReg. cogit CmpCq: objectMemory getScavengeThreshold R: byteSizeReg. jumpNoSpace := cogit JumpAboveOrEqual: 0. "write back new freeStart; get result. byteSizeReg holds new freeStart, the limit of the object" cogit MoveR: byteSizeReg Aw: objectMemory freeStartAddress. cogit MoveR: Arg1Reg R: ReceiverResultReg. "write other half of header (numSlots/identityHash)" cogit MoveR: halfHeaderReg Mw: 4 r: Arg1Reg. "now fill" cogit LoadEffectiveAddressMw: objectMemory baseHeaderSize r: ReceiverResultReg R: Arg1Reg. cogit MoveCq: objectMemory nilObject R: fillReg. "at least two words; so can make this a [fill 2 words. reached limit?] whileFalse" fillLoop := cogit MoveR: fillReg Mw: 0 r: Arg1Reg. cogit MoveR: fillReg Mw: 4 r: Arg1Reg. cogit AddCq: 8 R: Arg1Reg. cogit CmpR: Arg1Reg R: byteSizeReg. cogit JumpAbove: fillLoop. cogit RetN: retNoffset. jumpUnhashed jmpTarget: (jumpVariableOrEphemeron jmpTarget: (jumpTooBig jmpTarget: (jumpNoSpace jmpTarget: cogit Label))). ^0! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>genInnerPrimitiveNewWithArg: (in category 'primitive generators') ----- genInnerPrimitiveNewWithArg: retNoffset "Implement primitiveNewWithArg for convenient cases: - the receiver has a hash - the receiver is variable and not compiled method - single word header/num slots < numSlotsMask - the result fits in eden See superclass method for dynamic frequencies of formats. For the moment we implement only arrayFormat, firstByteFormat & firstLongFormat" | halfHeaderReg fillReg instSpecReg byteSizeReg maxSlots jumpArrayTooBig jumpByteTooBig jumpLongTooBig jumpArrayFormat jumpByteFormat jumpBytePrepDone jumpLongPrepDone jumpUnhashed jumpNElementsNonInt jumpFailCuzFixed jumpNoSpace jumpHasSlots fillLoop skip | <var: 'skip' type: #'AbstractInstruction *'> <var: 'fillLoop' type: #'AbstractInstruction *'> <var: 'jumpHasSlots' type: #'AbstractInstruction *'> <var: 'jumpNoSpace' type: #'AbstractInstruction *'> <var: 'jumpUnhashed' type: #'AbstractInstruction *'> <var: 'jumpByteFormat' type: #'AbstractInstruction *'> <var: 'jumpByteTooBig' type: #'AbstractInstruction *'> <var: 'jumpLongTooBig' type: #'AbstractInstruction *'> <var: 'jumpArrayFormat' type: #'AbstractInstruction *'> <var: 'jumpArrayTooBig' type: #'AbstractInstruction *'> <var: 'jumpFailCuzFixed' type: #'AbstractInstruction *'> <var: 'jumpBytePrepDone' type: #'AbstractInstruction *'> <var: 'jumpLongPrepDone' type: #'AbstractInstruction *'> <var: 'jumpNElementsNonInt' type: #'AbstractInstruction *'> "half header will contain 1st half of header (classIndex/class's hash & format), then 2nd half of header (numSlots) and finally fill value (nilObject)." halfHeaderReg := fillReg := SendNumArgsReg. "inst spec will hold class's instance specification and then byte size and finally numSlots half of header" instSpecReg := byteSizeReg := ClassReg. "The max slots we'll allocate here are those for a single header" maxSlots := objectMemory numSlotsMask - 1. "get freeStart as early as possible so as not to wait later..." cogit MoveAw: objectMemory freeStartAddress R: Arg1Reg. "get class's hash & fail if 0" self genGetHashFieldNonImmOf: ReceiverResultReg into: halfHeaderReg. jumpUnhashed := cogit JumpZero: 0. "get index and fail if not a +ve integer" cogit MoveR: Arg0Reg R: TempReg. jumpNElementsNonInt := self genJumpNotSmallIntegerInScratchReg: TempReg. "get class's format inst var for inst spec (format field)" self genLoadSlot: InstanceSpecificationIndex sourceReg: ReceiverResultReg destReg: instSpecReg. cogit LogicalShiftRightCq: objectMemory fixedFieldsFieldWidth + self numSmallIntegerTagBits R: instSpecReg. cogit AndCq: objectMemory formatMask R: instSpecReg. "Add format to classIndex/format half header now" cogit MoveR: instSpecReg R: TempReg. cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg. cogit AddR: TempReg R: halfHeaderReg. "get integer value of num fields in TempReg now" cogit MoveR: Arg0Reg R: TempReg. + self genConvertSmallIntegerToIntegerInReg: TempReg. - self genConvertSmallIntegerToIntegerInScratchReg: TempReg. "dispatch on format, failing if not variable or if compiled method" cogit CmpCq: objectMemory arrayFormat R: instSpecReg. jumpArrayFormat := cogit JumpZero: 0. cogit CmpCq: objectMemory firstByteFormat R: instSpecReg. jumpByteFormat := cogit JumpZero: 0. cogit CmpCq: objectMemory firstLongFormat R: instSpecReg. jumpFailCuzFixed := cogit JumpNonZero: 0. cogit CmpCq: (objectMemory integerObjectOf: maxSlots) R: Arg0Reg. jumpLongTooBig := cogit JumpAbove: 0. "save num elements/slot size to instSpecReg" cogit MoveR: TempReg R: instSpecReg. "push fill value" cogit MoveCq: 0 R: TempReg. cogit PushR: TempReg. jumpLongPrepDone := cogit Jump: 0. "go allocate" jumpByteFormat jmpTarget: (cogit CmpCq: (objectMemory integerObjectOf: maxSlots * objectMemory wordSize) R: Arg0Reg). jumpByteTooBig := cogit JumpAbove: 0. "save num elements to instSpecReg" cogit MoveR: TempReg R: instSpecReg. "compute odd bits and add into halfHeaderReg; oddBits := 4 - nElements bitAnd: 3" cogit MoveCq: objectMemory wordSize R: TempReg. cogit SubR: instSpecReg R: TempReg. cogit AndCq: objectMemory wordSize - 1 R: TempReg. cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg. cogit AddR: TempReg R: halfHeaderReg. "round up num elements to numSlots in instSpecReg" cogit AddCq: objectMemory wordSize - 1 R: instSpecReg. cogit LogicalShiftRightCq: objectMemory shiftForWord R: instSpecReg. "push fill value" cogit MoveCq: 0 R: TempReg. cogit PushR: TempReg. jumpBytePrepDone := cogit Jump: 0. "go allocate" jumpArrayFormat jmpTarget: (cogit CmpCq: (objectMemory integerObjectOf: maxSlots) R: Arg0Reg). jumpArrayTooBig := cogit JumpAbove: 0. "save num elements/slot size to instSpecReg" cogit MoveR: TempReg R: instSpecReg. "push fill value" cogit MoveCw: objectMemory nilObject R: TempReg. cogit PushR: TempReg. "fall through to allocate" jumpBytePrepDone jmpTarget: (jumpLongPrepDone jmpTarget: cogit Label). "write half header now; it frees halfHeaderReg" cogit MoveR: halfHeaderReg Mw: 0 r: Arg1Reg. "save numSlots to halfHeaderReg" cogit MoveR: instSpecReg R: halfHeaderReg. "compute byte size; remember 0-sized objects still need 1 slot & allocation is rounded up to 8 bytes." cogit CmpCq: 0 R: byteSizeReg. "a.k.a. instSpecReg" jumpHasSlots := cogit JumpNonZero: 0. cogit MoveCq: objectMemory baseHeaderSize * 2 R: byteSizeReg. skip := cogit Jump: 0. "round up to allocationUnit" jumpHasSlots jmpTarget: (cogit MoveR: byteSizeReg R: TempReg). cogit AndCq: 1 R: TempReg. cogit AddR: TempReg R: byteSizeReg. cogit AddCq: objectMemory baseHeaderSize / objectMemory wordSize R: byteSizeReg. cogit LogicalShiftLeftCq: objectMemory shiftForWord R: byteSizeReg. skip jmpTarget: "shift halfHeaderReg to put numSlots in correct place" (cogit LogicalShiftLeftCq: objectMemory numSlotsHalfShift R: halfHeaderReg). "check if allocation fits" cogit AddR: Arg1Reg R: byteSizeReg. cogit CmpCq: objectMemory getScavengeThreshold R: byteSizeReg. jumpNoSpace := cogit JumpAboveOrEqual: 0. "get result, increment freeStart and write it back. Arg1Reg holds new freeStart, the limit of the object" cogit MoveR: Arg1Reg R: ReceiverResultReg. cogit MoveR: byteSizeReg Aw: objectMemory freeStartAddress. "write other half of header (numSlots/0 identityHash)" cogit MoveR: halfHeaderReg Mw: 4 r: ReceiverResultReg. "now fill" cogit PopR: fillReg. cogit LoadEffectiveAddressMw: objectMemory baseHeaderSize r: ReceiverResultReg R: Arg1Reg. "at least two words; so can make this a [fill 2 words. reached limit?] whileFalse" fillLoop := cogit MoveR: fillReg Mw: 0 r: Arg1Reg. cogit MoveR: fillReg Mw: 4 r: Arg1Reg. cogit AddCq: 8 R: Arg1Reg. cogit CmpR: Arg1Reg R: byteSizeReg. cogit JumpAbove: fillLoop. cogit RetN: retNoffset. "pop discarded fill value & fall through to failure" jumpNoSpace jmpTarget: (cogit PopR: TempReg). jumpUnhashed jmpTarget: (jumpFailCuzFixed jmpTarget: (jumpArrayTooBig jmpTarget: (jumpByteTooBig jmpTarget: (jumpLongTooBig jmpTarget: (jumpNElementsNonInt jmpTarget: cogit Label))))). ^0! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>genInnerPrimitiveStringAt: (in category 'primitive generators') ----- genInnerPrimitiveStringAt: retNoffset "Implement the guts of primitiveStringAt; dispatch on size" | formatReg jumpNotIndexable jumpSmallSize jumpBadIndex done jumpIsBytes jumpIsShorts jumpIsWords jumpWordTooBig jumpBytesOutOfBounds jumpShortsOutOfBounds jumpWordsOutOfBounds | <inline: true> "c.f. StackInterpreter>>stSizeOf: SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:" <var: #done type: #'AbstractInstruction *'> <var: #jumpIsBytes type: #'AbstractInstruction *'> <var: #jumpIsShorts type: #'AbstractInstruction *'> <var: #jumpIsWords type: #'AbstractInstruction *'> <var: #jumpBadIndex type: #'AbstractInstruction *'> <var: #jumpSmallSize type: #'AbstractInstruction *'> <var: #jumpWordTooBig type: #'AbstractInstruction *'> <var: #jumpNotIndexable type: #'AbstractInstruction *'> <var: #jumpBytesOutOfBounds type: #'AbstractInstruction *'> <var: #jumpShortsOutOfBounds type: #'AbstractInstruction *'> <var: #jumpWordsOutOfBounds type: #'AbstractInstruction *'> cogit MoveR: Arg0Reg R: TempReg. cogit MoveR: Arg0Reg R: Arg1Reg. jumpBadIndex := self genJumpNotSmallIntegerInScratchReg: TempReg. + self genConvertSmallIntegerToIntegerInReg: Arg1Reg. - self genConvertSmallIntegerToIntegerInScratchReg: Arg1Reg. cogit SubCq: 1 R: Arg1Reg. "1-rel => 0-rel" formatReg := SendNumArgsReg. cogit MoveMw: 0 r: ReceiverResultReg R: formatReg; "formatReg := least significant half of self baseHeader: receiver" MoveR: formatReg R: TempReg; LogicalShiftRightCq: objectMemory formatShift R: formatReg; AndCq: objectMemory formatMask R: formatReg. "formatReg := self formatOfHeader: destReg" "get numSlots into ClassReg." cogit MoveCq: 0 R: ClassReg. "N.B. MoveMb:r:R: does not zero other bits" cogit MoveMb: 7 r: ReceiverResultReg R: ClassReg. "MSB of header" cogit CmpCq: objectMemory numSlotsMask R: ClassReg. jumpSmallSize := cogit JumpLess: 0. cogit MoveMw: -8 r: ReceiverResultReg R: ClassReg. "LSW of overflow size header" "dispatch on format in a combination of highest dynamic frequency order first and convenience. 0 = 0 sized objects (UndefinedObject True False et al) 1 = non-indexable objects with inst vars (Point et al) 2 = indexable objects with no inst vars (Array et al) 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) 4 = weak indexable objects with inst vars (WeakArray et al) 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) 6 unused, reserved for exotic pointer objects? 7 Forwarded Object, 1st field is pointer, rest of fields are ignored 8 unused, reserved for exotic non-pointer objects? 9 (?) 64-bit indexable 10 - 11 32-bit indexable 12 - 15 16-bit indexable 16 - 23 byte indexable 24 - 31 compiled method" jumpSmallSize jmpTarget: (cogit CmpCq: objectMemory firstByteFormat R: formatReg). jumpIsBytes := cogit JumpGreaterOrEqual: 0. cogit CmpCq: objectMemory firstShortFormat R: formatReg. jumpIsShorts := cogit JumpGreaterOrEqual: 0. cogit CmpCq: objectMemory firstLongFormat R: formatReg. jumpIsWords := cogit JumpGreaterOrEqual: 0. jumpNotIndexable := cogit Jump: 0. jumpIsBytes jmpTarget: (cogit LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg). cogit AndCq: objectMemory wordSize - 1 R: formatReg. cogit SubR: formatReg R: ClassReg; CmpR: Arg1Reg R: ClassReg. jumpBytesOutOfBounds := cogit JumpBelowOrEqual: 0. cogit AddCq: objectMemory baseHeaderSize R: Arg1Reg. cogit MoveXbr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. done := cogit Label. + self genConvertIntegerToCharacterInReg: ReceiverResultReg. - self genConvertIntegerToCharacterInScratchReg: ReceiverResultReg. cogit RetN: retNoffset. jumpIsShorts jmpTarget: (cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg). cogit AndCq: 1 R: formatReg. cogit SubR: formatReg R: ClassReg; CmpR: Arg1Reg R: ClassReg. jumpShortsOutOfBounds := cogit JumpBelowOrEqual: 0. cogit AddR: Arg1Reg R: ReceiverResultReg. cogit MoveM16: objectMemory baseHeaderSize r: ReceiverResultReg R: ReceiverResultReg. cogit Jump: done. jumpIsWords jmpTarget: (cogit CmpR: Arg1Reg R: ClassReg). jumpWordsOutOfBounds := cogit JumpBelowOrEqual: 0. cogit AddCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg. cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: TempReg. cogit SubCq: objectMemory baseHeaderSize >> objectMemory shiftForWord R: Arg1Reg. jumpWordTooBig := self jumpNotCharacterUnsignedValueInRegister: TempReg. cogit MoveR: TempReg R: ReceiverResultReg. cogit Jump: done. jumpBytesOutOfBounds jmpTarget: (jumpShortsOutOfBounds jmpTarget: (jumpWordsOutOfBounds jmpTarget: (jumpWordTooBig jmpTarget: (jumpNotIndexable jmpTarget: (jumpBadIndex jmpTarget: cogit Label))))). ^0! Item was added: + ----- Method: CogObjectRepresentationForSpur>>genConvertIntegerToCharacterInReg: (in category 'compile abstract instructions') ----- + genConvertIntegerToCharacterInReg: reg + cogit + LogicalShiftLeftCq: objectMemory numTagBits R: reg; + AddCq: objectMemory characterTag R: reg. + ^0! Item was removed: - ----- Method: CogObjectRepresentationForSpur>>genConvertIntegerToCharacterInScratchReg: (in category 'compile abstract instructions') ----- - genConvertIntegerToCharacterInScratchReg: reg - cogit - LogicalShiftLeftCq: objectMemory numTagBits R: reg; - AddCq: objectMemory characterTag R: reg. - ^0! Item was changed: ----- Method: CogObjectRepresentationForSpur>>genInnerPrimitiveSize: (in category 'primitive generators') ----- genInnerPrimitiveSize: retNoffset | jumpImm jumpNotIndexable jumpIsContext | "c.f. StackInterpreter>>stSizeOf: lengthOf:baseHeader:format: fixedFieldsOf:format:length:" <var: #jumpImm type: #'AbstractInstruction *'> <var: #jumpNotIndexable type: #'AbstractInstruction *'> <var: #jumpIsContext type: #'AbstractInstruction *'> cogit MoveR: ReceiverResultReg R: TempReg. jumpImm := self genJumpImmediateInScratchReg: TempReg. self genGetSizeOf: ReceiverResultReg into: ClassReg formatReg: SendNumArgsReg scratchReg: TempReg abortJumpsInto: [:jnx :jic| jumpNotIndexable := jnx. jumpIsContext := jic]. + self genConvertIntegerToSmallIntegerInReg: ClassReg. - self genConvertIntegerToSmallIntegerInScratchReg: ClassReg. cogit MoveR: ClassReg R: ReceiverResultReg. cogit RetN: retNoffset. jumpImm jmpTarget: (jumpNotIndexable jmpTarget: (jumpIsContext jmpTarget: cogit Label)). ^0! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>genConvertIntegerToSmallIntegerInReg: (in category 'compile abstract instructions') ----- + genConvertIntegerToSmallIntegerInReg: reg + cogit LogicalShiftLeftCq: 1 R: reg. + cogit AddCq: 1 R: reg. + ^0! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>genConvertSmallIntegerToIntegerInReg: (in category 'compile abstract instructions') ----- + genConvertSmallIntegerToIntegerInReg: reg + cogit ArithmeticShiftRightCq: 1 R: reg. + ^0! Item was removed: - ----- Method: CogObjectRepresentationForSqueakV3>>genConvertSmallIntegerToIntegerInScratchReg: (in category 'compile abstract instructions') ----- - genConvertSmallIntegerToIntegerInScratchReg: scratchReg - cogit ArithmeticShiftRightCq: 1 R: scratchReg. - ^0! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>genInnerPrimitiveAt: (in category 'primitive generators') ----- genInnerPrimitiveAt: retNoffset | jumpSI jumpNotSI jumpNotIndexable jumpIsContext jumpBounds jumpFmtGt4 jumpFmtEq2 jumpFmtLt8 jumpFmtGt11 jumpLarge | "c.f. StackInterpreter>>stSizeOf: lengthOf:baseHeader:format: fixedFieldsOf:format:length:" <var: #jumpSI type: #'AbstractInstruction *'> <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpNotIndexable type: #'AbstractInstruction *'> <var: #jumpIsContext type: #'AbstractInstruction *'> <var: #jumpBounds type: #'AbstractInstruction *'> <var: #jumpFmtGt4 type: #'AbstractInstruction *'> <var: #jumpFmtEq2 type: #'AbstractInstruction *'> <var: #jumpFmtLt8 type: #'AbstractInstruction *'> <var: #jumpFmtGt11 type: #'AbstractInstruction *'> <var: #jumpLarge type: #'AbstractInstruction *'> cogit MoveR: ReceiverResultReg R: TempReg. jumpSI := self genJumpSmallIntegerInScratchReg: TempReg. cogit MoveR: Arg0Reg R: TempReg. cogit MoveR: Arg0Reg R: Arg1Reg. jumpNotSI := self genJumpNotSmallIntegerInScratchReg: TempReg. self genGetSizeOf: ReceiverResultReg into: ClassReg formatReg: SendNumArgsReg scratchReg: TempReg abortJumpsInto: [:jnx :jic| jumpNotIndexable := jnx. jumpIsContext := jic]. + self genConvertSmallIntegerToIntegerInReg: Arg1Reg. - self genConvertSmallIntegerToIntegerInScratchReg: Arg1Reg. cogit SubCq: 1 R: Arg1Reg. cogit CmpR: ClassReg R: Arg1Reg. jumpBounds := cogit JumpAboveOrEqual: 0. "This is tedious. Because of register pressure on x86 (and the baroque complexity of the size computation) we have to recompute the format because it may have been smashed computing the fixed fields. But at least we have the fixed fields, if any, in formatReg and recomputing these is more expensive than recomputing format. In any case this should still be faster than the interpreter and we hope this object representation's days are numbered." cogit MoveMw: 0 r: ReceiverResultReg R: ClassReg; "self baseHeader: receiver" LogicalShiftRightCq: objectMemory instFormatFieldLSB R: ClassReg; AndCq: self instFormatFieldMask R: ClassReg; "self formatOfHeader: ClassReg" CmpCq: 4 R: ClassReg. jumpFmtGt4 := cogit JumpGreater: 0. cogit CmpCq: 2 R: ClassReg. "Common case, e.g. Array, has format = 2" jumpFmtEq2 := cogit JumpZero: 0. cogit AddR: SendNumArgsReg R: Arg1Reg. "Add fixed fields to index" jumpFmtEq2 jmpTarget: cogit Label. cogit "Too lazy [knackered, more like. ed.] to define index with displacement addressing right now" AddCq: BaseHeaderSize / BytesPerWord R: Arg1Reg; MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg; RetN: retNoffset. jumpFmtGt4 jmpTarget: cogit Label. "Byte objects have formats 8 through 15, Compiled methods being 12 through 15; fail for CompiledMethod allowing the CoInterpeter to impose stricter bounds checks." cogit CmpCq: 8 R: ClassReg. jumpFmtLt8 := cogit JumpLess: 0. cogit CmpCq: 11 R: ClassReg. jumpFmtGt11 := cogit JumpGreater: 0. cogit AddCq: BaseHeaderSize R: Arg1Reg; MoveXbr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. + self genConvertIntegerToSmallIntegerInReg: ReceiverResultReg. - self genConvertIntegerToSmallIntegerInScratchReg: ReceiverResultReg. cogit RetN: retNoffset. jumpFmtLt8 jmpTarget: cogit Label. self assert: BytesPerWord = 4. "documenting my laziness" cogit "Too lazy [knackered, more like. ed.] to define index with displacement addressing right now" AddCq: BaseHeaderSize / BytesPerWord R: Arg1Reg; MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg; CmpCq: 16r3FFFFFFF R: ReceiverResultReg. jumpLarge := cogit JumpAbove: 0. self genConvertIntegerToSmallIntegerInScratchReg: ReceiverResultReg. cogit RetN: retNoffset. jumpLarge jmpTarget: (cogit CallRT: cogit cePositive32BitIntegerTrampoline). cogit MoveR: TempReg R: ReceiverResultReg; RetN: retNoffset. jumpSI jmpTarget: (jumpNotSI jmpTarget: (jumpNotIndexable jmpTarget: (jumpIsContext jmpTarget: (jumpBounds jmpTarget: (jumpFmtGt11 jmpTarget: cogit Label))))). ^0! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>genInnerPrimitiveSize: (in category 'primitive generators') ----- genInnerPrimitiveSize: retNoffset | jumpSI jumpNotIndexable jumpIsContext | "c.f. StackInterpreter>>stSizeOf: lengthOf:baseHeader:format: fixedFieldsOf:format:length:" <var: #jumpSI type: #'AbstractInstruction *'> <var: #jumpNotIndexable type: #'AbstractInstruction *'> <var: #jumpIsContext type: #'AbstractInstruction *'> cogit MoveR: ReceiverResultReg R: TempReg. jumpSI := self genJumpSmallIntegerInScratchReg: TempReg. self genGetSizeOf: ReceiverResultReg into: ClassReg formatReg: SendNumArgsReg scratchReg: TempReg abortJumpsInto: [:jnx :jic| jumpNotIndexable := jnx. jumpIsContext := jic]. + self genConvertIntegerToSmallIntegerInReg: ClassReg. - self genConvertIntegerToSmallIntegerInScratchReg: ClassReg. cogit MoveR: ClassReg R: ReceiverResultReg. cogit RetN: retNoffset. jumpSI jmpTarget: (jumpNotIndexable jmpTarget: (jumpIsContext jmpTarget: cogit Label)). ^0! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>genInnerPrimitiveStringAt: (in category 'primitive generators') ----- genInnerPrimitiveStringAt: retNOffset | jumpSI jumpNotSI jumpNotByteIndexable jumpBounds jumpShortHeader jumpSkip | "c.f. StackInterpreter>>stSizeOf: lengthOf:baseHeader:format: fixedFieldsOf:format:length:" <var: #jumpSI type: #'AbstractInstruction *'> <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpNotByteIndexable type: #'AbstractInstruction *'> <var: #jumpBounds type: #'AbstractInstruction *'> <var: #jumpShortHeader type: #'AbstractInstruction *'> <var: #jumpSkip type: #'AbstractInstruction *'> cogit MoveR: ReceiverResultReg R: TempReg. jumpSI := self genJumpSmallIntegerInScratchReg: TempReg. cogit MoveR: Arg0Reg R: TempReg. cogit MoveR: Arg0Reg R: Arg1Reg. jumpNotSI := self genJumpNotSmallIntegerInScratchReg: TempReg. cogit MoveMw: 0 r: ReceiverResultReg R: TempReg; "self baseHeader: receiver" MoveR: TempReg R: ClassReg; "copy header word; we'll need it later" LogicalShiftRightCq: objectMemory instFormatFieldLSB R: TempReg; AndCq: self instFormatFieldMask R: TempReg; "self formatOfHeader: destReg" MoveR: TempReg R: SendNumArgsReg; AndCq: 3 R: SendNumArgsReg; "get odd bytes from format (if it turns out to be bytes)" SubR: SendNumArgsReg R: TempReg; CmpCq: 8 R: TempReg. "check format is 8" jumpNotByteIndexable := cogit JumpNonZero: 0. cogit MoveR: ClassReg R: TempReg; AndCq: TypeMask R: TempReg; CmpCq: HeaderTypeSizeAndClass R: TempReg. "(hdr bitAnd: TypeMask) = HeaderTypeSizeAndClass" jumpShortHeader := cogit JumpNonZero: 0. self assert: Size4Bit = 0. cogit MoveMw: 0 - (2 * BytesPerWord) r: ReceiverResultReg R: ClassReg; "(self sizeHeader: oop) bitAnd: LongSizeMask" AndCq: LongSizeMask signedIntFromLong R: ClassReg. jumpSkip := cogit Jump: 0. jumpShortHeader jmpTarget: (cogit AndCq: SizeMask R: ClassReg). "hdr bitAnd: SizeMask" jumpSkip jmpTarget: (cogit SubCq: BaseHeaderSize R: ClassReg). "sz - BaseHeaderSize" cogit SubR: SendNumArgsReg R: ClassReg. "sz - (fmt bitAnd: 3)" + self genConvertSmallIntegerToIntegerInReg: Arg1Reg. - self genConvertSmallIntegerToIntegerInScratchReg: Arg1Reg. cogit SubCq: 1 R: Arg1Reg. cogit CmpR: ClassReg R: Arg1Reg. jumpBounds := cogit JumpAboveOrEqual: 0. cogit AddCq: BaseHeaderSize R: Arg1Reg. cogit annotate: (cogit MoveCw: objectMemory characterTable R: Arg0Reg) objRef: objectMemory characterTable. cogit MoveXbr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg; AddCq: BaseHeaderSize / BytesPerWord R: ReceiverResultReg. cogit MoveXwr: ReceiverResultReg R: Arg0Reg R: ReceiverResultReg. cogit RetN: retNOffset. jumpSI jmpTarget: (jumpNotSI jmpTarget: (jumpNotByteIndexable jmpTarget: (jumpBounds jmpTarget: cogit Label))). ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>compileGetErrorCode (in category 'compile abstract instructions') ----- compileGetErrorCode "After pushing the temporaries but before the stack limit check a primitive method needs to fetch the error code, if any, and replace the last temp with it." <inline: false> | jmpNoError primErrorTable primErrorTableSize jmpIntError jmpGotError | <var: #jmpNoError type: #'AbstractInstruction *'> <var: #jmpIntError type: #'AbstractInstruction *'> <var: #jmpGotError type: #'AbstractInstruction *'> self MoveAw: coInterpreter primFailCodeAddress R: TempReg. self flag: 'ask concrete code gen if move sets condition codes?'. self CmpCq: 0 R: TempReg. jmpNoError := self JumpZero: 0. primErrorTable := coInterpreter primErrTable. primErrorTableSize := objectMemory lengthOf: primErrorTable. self flag: 'use CmpCqR if pc mapping means stable contexts never contain native pcs'. "Can't use CmpCqR here because table could change its size. Assume generated code is flushed whenever primitive error table is changed." self CmpCw: primErrorTableSize R: TempReg. jmpIntError := self JumpAboveOrEqual: 0. "Filter out negative values as well" objectRepresentation genFetchIndexRegister: TempReg from: primErrorTable into: ClassReg. jmpGotError := self Jump: 0. jmpIntError jmpTarget: self Label. + objectRepresentation genConvertIntegerToSmallIntegerInReg: TempReg. - objectRepresentation genConvertIntegerToSmallIntegerInScratchReg: TempReg. self MoveR: TempReg R: ClassReg. jmpGotError jmpTarget: (self MoveR: ClassReg Mw: 0 r: SPReg). "zero the error code to agree with the interpreter's (internal)ActivateNewMethod." self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. jmpNoError jmpTarget: self Label! Item was changed: ----- Method: SimpleStackBasedCogit>>genDoubleArithmetic:preOpCheck: (in category 'primitive generators') ----- genDoubleArithmetic: arithmeticOperator preOpCheck: preOpCheckOrNil "Stack looks like receiver (also in ResultReceiverReg) arg return address" <var: #preOpCheckOrNil declareC: 'AbstractInstruction *(*preOpCheckOrNil)(int rcvrReg, int argReg)'> | jumpFailClass jumpFailAlloc jumpFailCheck jumpImmediate jumpNonInt doOp fail | <var: #jumpFailClass type: #'AbstractInstruction *'> <var: #jumpFailAlloc type: #'AbstractInstruction *'> <var: #jumpNonInt type: #'AbstractInstruction *'> <var: #jumpImmediate type: #'AbstractInstruction *'> <var: #jumpFailCheck type: #'AbstractInstruction *'> <var: #doOp type: #'AbstractInstruction *'> <var: #fail type: #'AbstractInstruction *'> self MoveMw: BytesPerWord r: SPReg R: TempReg. objectRepresentation genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0. self MoveR: TempReg R: ClassReg. jumpImmediate := objectRepresentation genJumpImmediateInScratchReg: TempReg. objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg into: SendNumArgsReg. self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. jumpFailClass := self JumpNonZero: 0. objectRepresentation genGetDoubleValueOf: ClassReg into: DPFPReg1. doOp := self Label. preOpCheckOrNil ifNotNil: [jumpFailCheck := self perform: preOpCheckOrNil with: DPFPReg0 with: DPFPReg1]. self gen: arithmeticOperator operand: DPFPReg1 operand: DPFPReg0. jumpFailAlloc := objectRepresentation genAllocFloatValue: DPFPReg0 into: SendNumArgsReg scratchReg: ClassReg scratchReg: TempReg. self MoveR: SendNumArgsReg R: ReceiverResultReg. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. jumpImmediate jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg]. + objectRepresentation genConvertSmallIntegerToIntegerInReg: ClassReg. - objectRepresentation genConvertSmallIntegerToIntegerInScratchReg: ClassReg. self ConvertR: ClassReg Rd: DPFPReg1. self Jump: doOp. jumpFailAlloc jmpTarget: self Label. self compileFallbackToInterpreterPrimitive. fail := self Label. jumpFailClass jmpTarget: fail. preOpCheckOrNil ifNotNil: [jumpFailCheck jmpTarget: fail]. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt jmpTarget: fail]. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genDoubleComparison:invert: (in category 'primitive generators') ----- genDoubleComparison: jumpOpcodeGenerator invert: invertComparison "Stack looks like receiver (also in ResultReceiverReg) arg return address" <var: #jumpOpcodeGenerator declareC: 'AbstractInstruction *(*jumpOpcodeGenerator)(void *)'> | jumpFail jumpImmediate jumpNonInt jumpCond compare | <var: #jumpImmediate type: #'AbstractInstruction *'> <var: #jumpNonInt type: #'AbstractInstruction *'> <var: #jumpCond type: #'AbstractInstruction *'> <var: #compare type: #'AbstractInstruction *'> <var: #jumpFail type: #'AbstractInstruction *'> self MoveMw: BytesPerWord r: SPReg R: TempReg. objectRepresentation genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0. self MoveR: TempReg R: ClassReg. jumpImmediate := objectRepresentation genJumpImmediateInScratchReg: TempReg. objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg into: SendNumArgsReg. self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. jumpFail := self JumpNonZero: 0. objectRepresentation genGetDoubleValueOf: ClassReg into: DPFPReg1. invertComparison "May need to invert for NaNs" ifTrue: [compare := self CmpRd: DPFPReg0 Rd: DPFPReg1] ifFalse: [compare := self CmpRd: DPFPReg1 Rd: DPFPReg0]. jumpCond := self perform: jumpOpcodeGenerator with: 0. "FP jumps are a little weird" self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. jumpCond jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: BytesPerWord * 2. jumpImmediate jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg]. + objectRepresentation genConvertSmallIntegerToIntegerInReg: ClassReg. - objectRepresentation genConvertSmallIntegerToIntegerInScratchReg: ClassReg. self ConvertR: ClassReg Rd: DPFPReg1. self Jump: compare. jumpFail jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt jmpTarget: jumpFail getJmpTarget]. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveAsFloat (in category 'primitive generators') ----- genPrimitiveAsFloat "Stack looks like receiver (also in ResultReceiverReg) return address" | jumpFailAlloc | <var: #jumpFailAlloc type: #'AbstractInstruction *'> self MoveR: ReceiverResultReg R: ClassReg. + objectRepresentation genConvertSmallIntegerToIntegerInReg: ClassReg. - objectRepresentation genConvertSmallIntegerToIntegerInScratchReg: ClassReg. self ConvertR: ClassReg Rd: DPFPReg0. jumpFailAlloc := objectRepresentation genAllocFloatValue: DPFPReg0 into: SendNumArgsReg scratchReg: ClassReg scratchReg: TempReg. self MoveR: SendNumArgsReg R: ReceiverResultReg. self flag: 'currently caller pushes result'. self RetN: BytesPerWord. jumpFailAlloc jmpTarget: self Label. ^self compileFallbackToInterpreterPrimitive! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveBitShift (in category 'primitive generators') ----- genPrimitiveBitShift "Stack looks like receiver (also in ResultReceiverReg) arg return address rTemp := ArgOffset(SP) rClass := tTemp rTemp := rTemp & 1 jz nonInt rClass >>= 1 cmp 0,rClass jge neg cmp 31,rClass // numSmallIntegerBits, jge for sign jge tooBig rTemp := rReceiver rTemp <<= rClass rTemp >>= rClass (arithmetic) cmp rTemp,rReceiver jnz ovfl rReceiver := rReceiver - 1 rReceiver := rReceiver <<= rClass rReceiver := rReceiver + 1 ret neg: rClass := 0 - rClass cmp 31,rClass jge inRange rClass := 31 inRange rReceiver := rReceiver >>= rClass. rReceiver := rReceiver | 1. ret ovfl tooBig nonInt: fail" | jumpNotSI jumpOvfl jumpNegative jumpTooBig jumpInRange | <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpOvfl type: #'AbstractInstruction *'> <var: #jumpNegative type: #'AbstractInstruction *'> <var: #jumpTooBig type: #'AbstractInstruction *'> <var: #jumpInRange type: #'AbstractInstruction *'> self MoveMw: BytesPerWord r: SPReg R: TempReg. self MoveR: TempReg R: ClassReg. jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. + objectRepresentation genConvertSmallIntegerToIntegerInReg: ClassReg. - objectRepresentation genConvertSmallIntegerToIntegerInScratchReg: ClassReg. (self lastOpcode setsConditionCodesFor: JumpNegative) ifFalse: [self CmpCq: 0 R: ClassReg]. "N.B. FLAGS := ClassReg - 0" jumpNegative := self JumpNegative: 0. self CmpCq: objectRepresentation numSmallIntegerBits R: ClassReg. "N.B. FLAGS := ClassReg - 31" jumpTooBig := self JumpGreaterOrEqual: 0. self MoveR: ReceiverResultReg R: TempReg. self LogicalShiftLeftR: ClassReg R: TempReg. self ArithmeticShiftRightR: ClassReg R: TempReg. self CmpR: TempReg R: ReceiverResultReg. "N.B. FLAGS := RRReg - TempReg" jumpOvfl := self JumpNonZero: 0. objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ReceiverResultReg. self LogicalShiftLeftR: ClassReg R: ReceiverResultReg. objectRepresentation genAddSmallIntegerTagsTo: ReceiverResultReg. self RetN: BytesPerWord * 2. jumpNegative jmpTarget: (self NegateR: ClassReg). self CmpCq: objectRepresentation numSmallIntegerBits R: ClassReg. "N.B. FLAGS := ClassReg - 31" jumpInRange := self JumpLessOrEqual: 0. self MoveCq: objectRepresentation numSmallIntegerBits R: ClassReg. jumpInRange jmpTarget: (self ArithmeticShiftRightR: ClassReg R: ReceiverResultReg). objectRepresentation genSetSmallIntegerTagsIn: ReceiverResultReg. self RetN: BytesPerWord * 2. jumpNotSI jmpTarget: (jumpTooBig jmpTarget: (jumpOvfl jmpTarget: self Label)). ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveDiv (in category 'primitive generators') ----- genPrimitiveDiv | jumpNotSI jumpZero jumpExact jumpSameSign convert | <var: #convert type: #'AbstractInstruction *'> <var: #jumpZero type: #'AbstractInstruction *'> <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpExact type: #'AbstractInstruction *'> <var: #jumpSameSign type: #'AbstractInstruction *'> self MoveMw: BytesPerWord r: SPReg R: TempReg. self MoveR: TempReg R: ClassReg. self MoveR: TempReg R: Arg1Reg. jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. "We must shift away the tags, not just subtract them, so that the overflow case doesn't actually overflow the machine instruction." objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ClassReg. (self lastOpcode setsConditionCodesFor: JumpZero) ifFalse: [self CmpCq: 0 R: ClassReg]. jumpZero := self JumpZero: 0. self MoveR: ReceiverResultReg R: TempReg. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: TempReg. self DivR: ClassReg R: TempReg Quo: TempReg Rem: ClassReg. "If remainder is zero we must check for overflow." self CmpCq: 0 R: ClassReg. jumpExact := self JumpZero: 0. "If arg and remainder signs are different we must round down." self XorR: ClassReg R: Arg1Reg. (self lastOpcode setsConditionCodesFor: JumpZero) ifFalse: [self CmpCq: 0 R: Arg1Reg]. jumpSameSign := self JumpGreaterOrEqual: 0. self SubCq: 1 R: TempReg. jumpSameSign jmpTarget: (convert := self Label). + objectRepresentation genConvertIntegerToSmallIntegerInReg: TempReg. - objectRepresentation genConvertIntegerToSmallIntegerInScratchReg: TempReg. self MoveR: TempReg R: ReceiverResultReg. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. "test for overflow; the only case is SmallInteger minVal // -1" jumpExact jmpTarget: (self CmpCq: (1 << (objectRepresentation numSmallIntegerBits - 1)) R: TempReg). self JumpLess: convert. jumpZero jmpTarget: (jumpNotSI jmpTarget: self Label). ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveDivide (in category 'primitive generators') ----- genPrimitiveDivide | jumpNotSI jumpZero jumpInexact jumpOverflow | <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpZero type: #'AbstractInstruction *'> <var: #jumpInexact type: #'AbstractInstruction *'> <var: #jumpOverflow type: #'AbstractInstruction *'> self MoveMw: BytesPerWord r: SPReg R: TempReg. self MoveR: TempReg R: ClassReg. jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. "We must shift away the tags, not just subtract them, so that the overflow case doesn't actually overflow the machine instruction." objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ClassReg. jumpZero := self JumpZero: 0. self MoveR: ReceiverResultReg R: TempReg. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: TempReg. self DivR: ClassReg R: TempReg Quo: TempReg Rem: ClassReg. "If remainder is non-zero fail." self CmpCq: 0 R: ClassReg. jumpInexact := self JumpNonZero: 0. "test for overflow; the only case is SmallInteger minVal / -1" self CmpCq: (1 << (objectRepresentation numSmallIntegerBits - 1)) R: TempReg. jumpOverflow := self JumpGreaterOrEqual: 0. + objectRepresentation genConvertIntegerToSmallIntegerInReg: TempReg. - objectRepresentation genConvertIntegerToSmallIntegerInScratchReg: TempReg. self MoveR: TempReg R: ReceiverResultReg. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. jumpOverflow jmpTarget: (jumpInexact jmpTarget: (jumpZero jmpTarget: (jumpNotSI jmpTarget: self Label))). ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveQuo (in category 'primitive generators') ----- genPrimitiveQuo | jumpNotSI jumpZero jumpOverflow | <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpZero type: #'AbstractInstruction *'> <var: #jumpOverflow type: #'AbstractInstruction *'> self MoveMw: BytesPerWord r: SPReg R: TempReg. self MoveR: TempReg R: ClassReg. jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. "We must shift away the tags, not just subtract them, so that the overflow case doesn't actually overflow the machine instruction." objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ClassReg. (self lastOpcode setsConditionCodesFor: JumpZero) ifFalse: [self CmpCq: 0 R: ClassReg]. jumpZero := self JumpZero: 0. self MoveR: ReceiverResultReg R: TempReg. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: TempReg. self DivR: ClassReg R: TempReg Quo: TempReg Rem: ClassReg. "test for overflow; the only case is SmallInteger minVal quo: -1" self CmpCq: (1 << (objectRepresentation numSmallIntegerBits - 1)) R: TempReg. jumpOverflow := self JumpGreaterOrEqual: 0. + objectRepresentation genConvertIntegerToSmallIntegerInReg: TempReg. - objectRepresentation genConvertIntegerToSmallIntegerInScratchReg: TempReg. self MoveR: TempReg R: ReceiverResultReg. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. jumpOverflow jmpTarget: (jumpZero jmpTarget: (jumpNotSI jmpTarget: self Label)). ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genSmallIntegerComparison:orDoubleComparison: (in category 'primitive generators') ----- genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator "Stack looks like receiver (also in ResultReceiverReg) arg return address" | jumpDouble jumpFail jumpTrue jumpCond | <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)'> <var: #jumpDouble type: #'AbstractInstruction *'> <var: #jumpFail type: #'AbstractInstruction *'> <var: #jumpTrue type: #'AbstractInstruction *'> <var: #jumpCond type: #'AbstractInstruction *'> self MoveMw: BytesPerWord r: SPReg R: TempReg. self MoveR: TempReg R: ClassReg. jumpDouble := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self CmpR: ClassReg R: ReceiverResultReg. "N.B. FLAGS := RRReg - ClassReg" jumpTrue := self gen: jumpOpcode. self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. jumpTrue jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: BytesPerWord * 2. "Argument may be a Float : let us check or fail" jumpDouble jmpTarget: self Label. objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg into: SendNumArgsReg. self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. jumpFail := self JumpNonZero: 0. "It was a Float, so convert the receiver to double and perform the operation" self MoveR: ReceiverResultReg R: TempReg. + objectRepresentation genConvertSmallIntegerToIntegerInReg: TempReg. - objectRepresentation genConvertSmallIntegerToIntegerInScratchReg: TempReg. self ConvertR: TempReg Rd: DPFPReg0. objectRepresentation genGetDoubleValueOf: ClassReg into: DPFPReg1. self CmpRd: DPFPReg1 Rd: DPFPReg0. jumpCond := self perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. jumpCond jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: BytesPerWord * 2. jumpFail jmpTarget: self Label. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genDoubleArithmetic:preOpCheck: (in category 'primitive generators') ----- genDoubleArithmetic: arithmeticOperator preOpCheck: preOpCheckOrNil "Receiver and arg in registers. Stack looks like return address" <var: #preOpCheckOrNil declareC: 'AbstractInstruction *(*preOpCheckOrNil)(int rcvrReg, int argReg)'> | jumpFailClass jumpFailAlloc jumpFailCheck jumpImmediate jumpNonInt doOp | <var: #jumpFailClass type: #'AbstractInstruction *'> <var: #jumpFailAlloc type: #'AbstractInstruction *'> <var: #jumpImmediate type: #'AbstractInstruction *'> <var: #jumpNonInt type: #'AbstractInstruction *'> <var: #jumpFailCheck type: #'AbstractInstruction *'> <var: #doOp type: #'AbstractInstruction *'> self MoveR: Arg0Reg R: TempReg. objectRepresentation genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0. self MoveR: Arg0Reg R: ClassReg. jumpImmediate := objectRepresentation genJumpImmediateInScratchReg: TempReg. objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. jumpFailClass := self JumpNonZero: 0. objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1. doOp := self Label. preOpCheckOrNil ifNotNil: [jumpFailCheck := self perform: preOpCheckOrNil with: DPFPReg0 with: DPFPReg1]. self gen: arithmeticOperator operand: DPFPReg1 operand: DPFPReg0. jumpFailAlloc := objectRepresentation genAllocFloatValue: DPFPReg0 into: SendNumArgsReg scratchReg: ClassReg scratchReg: TempReg. self MoveR: SendNumArgsReg R: ReceiverResultReg. self RetN: 0. "We need to push the register args on two paths; this one and the interpreter primitive path. But the interpreter primitive path won't unless regArgsHaveBeenPushed is false." self assert: methodOrBlockNumArgs <= self numRegArgs. jumpFailClass jmpTarget: self Label. preOpCheckOrNil ifNotNil: [jumpFailCheck jmpTarget: jumpFailClass getJmpTarget]. self genPushRegisterArgsForNumArgs: methodOrBlockNumArgs. jumpFailClass := self Jump: 0. jumpImmediate jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg]. + objectRepresentation genConvertSmallIntegerToIntegerInReg: ClassReg. - objectRepresentation genConvertSmallIntegerToIntegerInScratchReg: ClassReg. self ConvertR: ClassReg Rd: DPFPReg1. self Jump: doOp. jumpFailAlloc jmpTarget: self Label. self compileFallbackToInterpreterPrimitive. jumpFailClass jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt jmpTarget: jumpFailClass getJmpTarget]. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genDoubleComparison:invert: (in category 'primitive generators') ----- genDoubleComparison: jumpOpcodeGenerator invert: invertComparison "Receiver and arg in registers. Stack looks like return address" <var: #jumpOpcodeGenerator declareC: 'AbstractInstruction *(*jumpOpcodeGenerator)(void *)'> | jumpFail jumpImmediate jumpNonInt jumpCond compare | <var: #jumpImmediate type: #'AbstractInstruction *'> <var: #jumpNonInt type: #'AbstractInstruction *'> <var: #jumpCond type: #'AbstractInstruction *'> <var: #compare type: #'AbstractInstruction *'> <var: #jumpFail type: #'AbstractInstruction *'> self MoveR: Arg0Reg R: TempReg. objectRepresentation genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0. jumpImmediate := objectRepresentation genJumpImmediateInScratchReg: TempReg. objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. jumpFail := self JumpNonZero: 0. objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1. invertComparison "May need to invert for NaNs" ifTrue: [compare := self CmpRd: DPFPReg0 Rd: DPFPReg1] ifFalse: [compare := self CmpRd: DPFPReg1 Rd: DPFPReg0]. jumpCond := self perform: jumpOpcodeGenerator with: 0. "FP jumps are a little weird" self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self RetN: 0. jumpCond jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: 0. jumpImmediate jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg]. + objectRepresentation genConvertSmallIntegerToIntegerInReg: Arg0Reg. - objectRepresentation genConvertSmallIntegerToIntegerInScratchReg: Arg0Reg. self ConvertR: Arg0Reg Rd: DPFPReg1. self Jump: compare. jumpFail jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt jmpTarget: jumpFail getJmpTarget]. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPrimitiveAsFloat (in category 'primitive generators') ----- genPrimitiveAsFloat | jumpFailAlloc | <var: #jumpFailAlloc type: #'AbstractInstruction *'> self MoveR: ReceiverResultReg R: TempReg. + objectRepresentation genConvertSmallIntegerToIntegerInReg: TempReg. - objectRepresentation genConvertSmallIntegerToIntegerInScratchReg: TempReg. self ConvertR: TempReg Rd: DPFPReg0. jumpFailAlloc := objectRepresentation genAllocFloatValue: DPFPReg0 into: SendNumArgsReg scratchReg: ClassReg scratchReg: TempReg. self MoveR: SendNumArgsReg R: ReceiverResultReg. self RetN: 0. jumpFailAlloc jmpTarget: self Label. ^self compileFallbackToInterpreterPrimitive! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPrimitiveBitShift (in category 'primitive generators') ----- genPrimitiveBitShift "Receiver and arg in registers. Stack looks like return address rTemp := rArg0 rClass := tTemp rTemp := rTemp & 1 jz nonInt rClass >>= 1 cmp 0,rClass jge neg cmp 31,rClass // numSmallIntegerBits, jge for sign jge tooBig rTemp := rReceiver rTemp <<= rClass rTemp >>= rClass (arithmetic) cmp rTemp,rReceiver jnz ovfl rReceiver := rReceiver - 1 rReceiver := rReceiver <<= rClass rReceiver := rReceiver + 1 ret neg: rClass := 0 - rClass cmp 31,rClass jge inRange rClass := 31 inRange rReceiver := rReceiver >>= rClass. rReceiver := rReceiver | 1. ret ovfl tooBig nonInt: fail" | jumpNotSI jumpOvfl jumpNegative jumpTooBig jumpInRange | <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpOvfl type: #'AbstractInstruction *'> <var: #jumpNegative type: #'AbstractInstruction *'> <var: #jumpTooBig type: #'AbstractInstruction *'> <var: #jumpInRange type: #'AbstractInstruction *'> self assert: self numRegArgs >= 1. self MoveR: Arg0Reg R: TempReg. self MoveR: Arg0Reg R: ClassReg. jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. + objectRepresentation genConvertSmallIntegerToIntegerInReg: ClassReg. - objectRepresentation genConvertSmallIntegerToIntegerInScratchReg: ClassReg. (self lastOpcode setsConditionCodesFor: JumpNegative) ifFalse: [self CmpCq: 0 R: ClassReg]. "N.B. FLAGS := ClassReg - 0" jumpNegative := self JumpNegative: 0. self CmpCq: objectRepresentation numSmallIntegerBits R: ClassReg. "N.B. FLAGS := ClassReg - 31" jumpTooBig := self JumpGreaterOrEqual: 0. self MoveR: ReceiverResultReg R: TempReg. self LogicalShiftLeftR: ClassReg R: TempReg. self ArithmeticShiftRightR: ClassReg R: TempReg. self CmpR: TempReg R: ReceiverResultReg. "N.B. FLAGS := RRReg - TempReg" jumpOvfl := self JumpNonZero: 0. objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ReceiverResultReg. self LogicalShiftLeftR: ClassReg R: ReceiverResultReg. objectRepresentation genAddSmallIntegerTagsTo: ReceiverResultReg. self RetN: 0. jumpNegative jmpTarget: (self NegateR: ClassReg). self CmpCq: objectRepresentation numSmallIntegerBits R: ClassReg. "N.B. FLAGS := ClassReg - 31" jumpInRange := self JumpLessOrEqual: 0. self MoveCq: objectRepresentation numSmallIntegerBits R: ClassReg. jumpInRange jmpTarget: (self ArithmeticShiftRightR: ClassReg R: ReceiverResultReg). objectRepresentation genSetSmallIntegerTagsIn: ReceiverResultReg. self RetN: 0. jumpNotSI jmpTarget: (jumpTooBig jmpTarget: (jumpOvfl jmpTarget: self Label)). ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPrimitiveDiv (in category 'primitive generators') ----- genPrimitiveDiv | jumpNotSI jumpZero jumpExact jumpSameSign convert | <var: #convert type: #'AbstractInstruction *'> <var: #jumpZero type: #'AbstractInstruction *'> <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpExact type: #'AbstractInstruction *'> <var: #jumpSameSign type: #'AbstractInstruction *'> self MoveR: Arg0Reg R: TempReg. self MoveR: Arg0Reg R: ClassReg. self MoveR: Arg0Reg R: Arg1Reg. jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. "We must shift away the tags, not just subtract them, so that the overflow case doesn't actually overflow the machine instruction." objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ClassReg. (self lastOpcode setsConditionCodesFor: JumpZero) ifFalse: [self CmpCq: 0 R: ClassReg]. jumpZero := self JumpZero: 0. self MoveR: ReceiverResultReg R: TempReg. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: TempReg. self DivR: ClassReg R: TempReg Quo: TempReg Rem: ClassReg. "If remainder is zero we must check for overflow." self CmpCq: 0 R: ClassReg. jumpExact := self JumpZero: 0. "If arg and remainder signs are different we must round down." self XorR: ClassReg R: Arg1Reg. (self lastOpcode setsConditionCodesFor: JumpZero) ifFalse: [self CmpCq: 0 R: Arg1Reg]. jumpSameSign := self JumpGreaterOrEqual: 0. self SubCq: 1 R: TempReg. jumpSameSign jmpTarget: (convert := self Label). + objectRepresentation genConvertIntegerToSmallIntegerInReg: TempReg. - objectRepresentation genConvertIntegerToSmallIntegerInScratchReg: TempReg. self MoveR: TempReg R: ReceiverResultReg. self RetN: 0. "test for overflow; the only case is SmallInteger minVal // -1" jumpExact jmpTarget: (self CmpCq: (1 << (objectRepresentation numSmallIntegerBits - 1)) R: TempReg). self JumpLess: convert. jumpZero jmpTarget: (jumpNotSI jmpTarget: self Label). ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPrimitiveDivide (in category 'primitive generators') ----- genPrimitiveDivide | jumpNotSI jumpZero jumpInexact jumpOverflow | <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpZero type: #'AbstractInstruction *'> <var: #jumpInexact type: #'AbstractInstruction *'> <var: #jumpOverflow type: #'AbstractInstruction *'> self MoveR: Arg0Reg R: TempReg. self MoveR: Arg0Reg R: ClassReg. jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. "We must shift away the tags, not just subtract them, so that the overflow case doesn't actually overflow the machine instruction." objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ClassReg. jumpZero := self JumpZero: 0. self MoveR: ReceiverResultReg R: TempReg. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: TempReg. self DivR: ClassReg R: TempReg Quo: TempReg Rem: ClassReg. "If remainder is non-zero fail." self CmpCq: 0 R: ClassReg. jumpInexact := self JumpNonZero: 0. "test for overflow; the only case is SmallInteger minVal / -1" self CmpCq: (1 << (objectRepresentation numSmallIntegerBits - 1)) R: TempReg. jumpOverflow := self JumpGreaterOrEqual: 0. + objectRepresentation genConvertIntegerToSmallIntegerInReg: TempReg. - objectRepresentation genConvertIntegerToSmallIntegerInScratchReg: TempReg. self MoveR: TempReg R: ReceiverResultReg. self RetN: 0. jumpOverflow jmpTarget: (jumpInexact jmpTarget: (jumpZero jmpTarget: (jumpNotSI jmpTarget: self Label))). ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPrimitiveQuo (in category 'primitive generators') ----- genPrimitiveQuo | jumpNotSI jumpZero jumpOverflow | <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpZero type: #'AbstractInstruction *'> <var: #jumpOverflow type: #'AbstractInstruction *'> self MoveR: Arg0Reg R: TempReg. self MoveR: Arg0Reg R: ClassReg. jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. "We must shift away the tags, not just subtract them, so that the overflow case doesn't actually overflow the machine instruction." objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ClassReg. (self lastOpcode setsConditionCodesFor: JumpZero) ifFalse: [self CmpCq: 0 R: ClassReg]. jumpZero := self JumpZero: 0. self MoveR: ReceiverResultReg R: TempReg. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: TempReg. self DivR: ClassReg R: TempReg Quo: TempReg Rem: ClassReg. "test for overflow; the only case is SmallInteger minVal quo: -1" self CmpCq: (1 << (objectRepresentation numSmallIntegerBits - 1)) R: TempReg. jumpOverflow := self JumpGreaterOrEqual: 0. + objectRepresentation genConvertIntegerToSmallIntegerInReg: TempReg. - objectRepresentation genConvertIntegerToSmallIntegerInScratchReg: TempReg. self MoveR: TempReg R: ReceiverResultReg. self RetN: 0. jumpOverflow jmpTarget: (jumpZero jmpTarget: (jumpNotSI jmpTarget: self Label)). ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSmallIntegerComparison:orDoubleComparison: (in category 'primitive generators') ----- genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator "Stack looks like return address" | jumpDouble jumpFail jumpTrue jumpCond | <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)'> <var: #jumpDouble type: #'AbstractInstruction *'> <var: #jumpFail type: #'AbstractInstruction *'> <var: #jumpTrue type: #'AbstractInstruction *'> <var: #jumpCond type: #'AbstractInstruction *'> self MoveR: Arg0Reg R: TempReg. jumpDouble := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self CmpR: Arg0Reg R: ReceiverResultReg. "N.B. FLAGS := RRReg - Arg0Reg" jumpTrue := self gen: jumpOpcode. self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self RetN: 0. jumpTrue jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: 0. "Argument may be a Float : let us check or fail" jumpDouble jmpTarget: self Label. objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. jumpFail := self JumpNonZero: 0. "It was a Float, so convert the receiver to double and perform the operation" + objectRepresentation genConvertSmallIntegerToIntegerInReg: ReceiverResultReg. - objectRepresentation genConvertSmallIntegerToIntegerInScratchReg: ReceiverResultReg. self ConvertR: ReceiverResultReg Rd: DPFPReg0. objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1. self CmpRd: DPFPReg1 Rd: DPFPReg0. jumpCond := self perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self RetN: 0. jumpCond jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: 0. jumpFail jmpTarget: self Label. ^0!

1 0

[commit][2820] CogVM source as per VMMaker.oscog-eem.545.
by commits＠squeakvm.org 06 Dec '13

06 Dec '13

Revision: 2820 Author: eliot Date: 2013-12-06 14:44:48 -0800 (Fri, 06 Dec 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.545. Fix setting of endOfMemory on load in SqueakV3 VMs. Spur: Slight streamlining in followForwardingPointersInStackZone:, plus fixingfollowjng of frameMethodObject vs frameMethod in machine-code frames. Fix the concatenation of the assert-failure reason in isValidObjStackPage:myIndex:firstPage: so that it works in C. Slang: Generate the CoInterpreter *before* the Cogit so that the objectMemory andinterpreter classes have initialized *before* the Cogit is generated. Otherwisethe Cogit can be generated with values from the wrong interpreter/objectMemory. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-12-06 22:44:48 UTC (rev 2820) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGenerator VMMaker.oscog-eem.538 uuid: 6b6d8ba7-4913-4563-9d01-da880441f843 from - StackToRegisterMappingCogit VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + StackToRegisterMappingCogit VMMaker.oscog-eem.538 uuid: 6b6d8ba7-4913-4563-9d01-da880441f843 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.538 uuid: 6b6d8ba7-4913-4563-9d01-da880441f843 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-12-06 22:44:48 UTC (rev 2820) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGenerator VMMaker.oscog-eem.538 uuid: 6b6d8ba7-4913-4563-9d01-da880441f843 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-12-06 22:44:48 UTC (rev 2820) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGenerator VMMaker.oscog-eem.538 uuid: 6b6d8ba7-4913-4563-9d01-da880441f843 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-12-06 22:44:48 UTC (rev 2820) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 from - CoInterpreter VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b + CoInterpreter VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -587,7 +587,6 @@ static sqInt frameHasContext(char *theFP); static sqInt frameIsBlockActivation(char *theFP); static sqInt frameIsMarked(sqInt theFPInt); -static sqInt frameMethodObject(char *theFP); static sqInt frameMethod(char *theFP); static sqInt frameNumArgs(char *theFP); static char * frameOfMarriedContext(sqInt aContext); @@ -1325,6 +1324,7 @@ _iss sqInt statCheckForEvents; _iss sqInt statGrowMemory; _iss sqInt statMarkCount; +_iss sqInt cogCodeSize; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; _iss sqInt lowSpaceThreshold; @@ -1336,7 +1336,6 @@ _iss sqInt metaclassNumSlots; _iss sqInt pendingFinalizationSignals; _iss sqInt statIOProcessEvents; -_iss sqInt cogCodeSize; _iss usqInt fwdTableLast; _iss usqLong gcStartUsecs; _iss sqInt lastBackwardJumpMethod; @@ -2033,7 +2032,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.537"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.545"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -22301,10 +22300,11 @@ sqInt delta; sqInt fieldIndex; sqInt i; + sqInt newOop; sqInt numArgs; sqInt offset; sqInt offset1; - sqInt oop; + usqInt oop; char *theFP; usqInt theIPPtr; StackPage *thePage; @@ -22347,8 +22347,7 @@ : byteAt((theFP + FoxIFrameFlags) + 1)); offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << ShiftForWord); oop = longAt(theFP + offset); - if (((oop & 1) == 0) - && (isForwarded(oop))) { + if (isOopForwarded(oop)) { longAtput(theFP + offset, followForwarded(oop)); } if ((((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) @@ -22358,43 +22357,43 @@ longAtput(theFP + FoxThisContext, followForwarded(longAt(theFP + FoxThisContext))); } if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { - oop = longAt(theFP + FoxIFReceiver); - if (((oop & 1) == 0) - && (isForwarded(oop))) { - longAtput(theFP + FoxIFReceiver, followForwarded(oop)); + oop = longAt(theFP + FoxMFReceiver); + if (isOopForwarded(oop)) { + longAtput(theFP + FoxMFReceiver, followForwarded(oop)); } - assert(!(isForwarded(frameMethodObject(theFP)))); + oop = ((mframeHomeMethod(theFP))->methodObject); + assert(!(isForwarded(oop))); } else { oop = longAt(theFP + FoxIFReceiver); - if (((oop & 1) == 0) - && (isForwarded(oop))) { + if (isOopForwarded(oop)) { longAtput(theFP + FoxIFReceiver, followForwarded(oop)); } oop = longAt(theFP + FoxMethod); if (isForwarded(oop)) { - delta = (followForwarded(oop)) - oop; + newOop = followForwarded(oop); + delta = newOop - oop; if ((theIPPtr != 0) - && ((longAt(theIPPtr)) > (longAt(theFP + FoxMethod)))) { + && ((longAt(theIPPtr)) > oop)) { longAtput(theIPPtr, (longAt(theIPPtr)) + delta); } longAtput(theFP + FoxIFSavedIP, (longAt(theFP + FoxIFSavedIP)) + delta); - longAtput(theFP + FoxMethod, followForwarded(oop)); + longAtput(theFP + FoxMethod, (oop = newOop)); } } /* begin followNecessaryForwardingInMethod: */ /* begin literal:ofMethod: */ - offset1 = (literalCountOfHeader(headerOf(longAt(theFP + FoxMethod)))) - 1; - assoc = longAt(((longAt(theFP + FoxMethod)) + BaseHeaderSize) + ((offset1 + LiteralStart) << ShiftForWord)); + offset1 = (literalCountOfHeader(headerOf(oop))) - 1; + assoc = longAt((oop + BaseHeaderSize) + ((offset1 + LiteralStart) << ShiftForWord)); if (isForwarded(assoc)) { assoc = followForwarded(assoc); /* begin setMethodClassAssociationOf:to: */ /* begin storePointer:ofObject:withValue: */ - fieldIndex = ((literalCountOfHeader(headerOf(longAt(theFP + FoxMethod)))) + LiteralStart) - 1; - if ((((usqInt) (longAt(theFP + FoxMethod)))) < (((usqInt) GIV(youngStart)))) { - possibleRootStoreIntovalue(longAt(theFP + FoxMethod), assoc); + fieldIndex = ((literalCountOfHeader(headerOf(oop))) + LiteralStart) - 1; + if ((((usqInt) oop)) < (((usqInt) GIV(youngStart)))) { + possibleRootStoreIntovalue(oop, assoc); } - longAtput(((longAt(theFP + FoxMethod)) + BaseHeaderSize) + (fieldIndex << ShiftForWord), assoc); + longAtput((oop + BaseHeaderSize) + (fieldIndex << ShiftForWord), assoc); } classObj = longAt((assoc + BaseHeaderSize) + (ValueIndex << ShiftForWord)); if (isForwarded(classObj)) { @@ -22604,14 +22603,6 @@ } static sqInt -frameMethodObject(char *theFP) -{ - return ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((mframeHomeMethod(theFP))->methodObject) - : longAt(theFP + FoxMethod)); -} - -static sqInt frameMethod(char *theFP) { return longAt(theFP + FoxMethod); @@ -49478,8 +49469,8 @@ } /* begin setHeapBase:memoryLimit:endOfMemory: */ baseOfHeap = (memory()) + GIV(cogCodeSize); - memLimit = (memory()) + heapSize; - memEnd = (memory()) + dataSize; + memLimit = ((memory()) + GIV(cogCodeSize)) + heapSize; + memEnd = ((memory()) + GIV(cogCodeSize)) + dataSize; /* begin setMemoryLimit: */ assert((memLimit & (BytesPerWord - 1)) == 0); GIV(memoryLimit) = memLimit; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-12-06 22:44:48 UTC (rev 2820) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-12-06 22:44:48 UTC (rev 2820) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 from - CoInterpreter VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b + CoInterpreter VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -590,7 +590,6 @@ static sqInt frameHasContext(char *theFP); static sqInt frameIsBlockActivation(char *theFP); static sqInt frameIsMarked(sqInt theFPInt); -static sqInt frameMethodObject(char *theFP); static sqInt frameMethod(char *theFP); static sqInt frameNumArgs(char *theFP); static char * frameOfMarriedContext(sqInt aContext); @@ -1328,6 +1327,7 @@ _iss sqInt statCheckForEvents; _iss sqInt statGrowMemory; _iss sqInt statMarkCount; +_iss sqInt cogCodeSize; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; _iss sqInt lowSpaceThreshold; @@ -1339,7 +1339,6 @@ _iss sqInt metaclassNumSlots; _iss sqInt pendingFinalizationSignals; _iss sqInt statIOProcessEvents; -_iss sqInt cogCodeSize; _iss usqInt fwdTableLast; _iss usqLong gcStartUsecs; _iss sqInt lastBackwardJumpMethod; @@ -2036,7 +2035,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.537"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.545"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -22310,10 +22309,11 @@ sqInt delta; sqInt fieldIndex; sqInt i; + sqInt newOop; sqInt numArgs; sqInt offset; sqInt offset1; - sqInt oop; + usqInt oop; char *theFP; usqInt theIPPtr; StackPage *thePage; @@ -22356,8 +22356,7 @@ : byteAt((theFP + FoxIFrameFlags) + 1)); offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << ShiftForWord); oop = longAt(theFP + offset); - if (((oop & 1) == 0) - && (isForwarded(oop))) { + if (isOopForwarded(oop)) { longAtput(theFP + offset, followForwarded(oop)); } if ((((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) @@ -22367,43 +22366,43 @@ longAtput(theFP + FoxThisContext, followForwarded(longAt(theFP + FoxThisContext))); } if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { - oop = longAt(theFP + FoxIFReceiver); - if (((oop & 1) == 0) - && (isForwarded(oop))) { - longAtput(theFP + FoxIFReceiver, followForwarded(oop)); + oop = longAt(theFP + FoxMFReceiver); + if (isOopForwarded(oop)) { + longAtput(theFP + FoxMFReceiver, followForwarded(oop)); } - assert(!(isForwarded(frameMethodObject(theFP)))); + oop = ((mframeHomeMethod(theFP))->methodObject); + assert(!(isForwarded(oop))); } else { oop = longAt(theFP + FoxIFReceiver); - if (((oop & 1) == 0) - && (isForwarded(oop))) { + if (isOopForwarded(oop)) { longAtput(theFP + FoxIFReceiver, followForwarded(oop)); } oop = longAt(theFP + FoxMethod); if (isForwarded(oop)) { - delta = (followForwarded(oop)) - oop; + newOop = followForwarded(oop); + delta = newOop - oop; if ((theIPPtr != 0) - && ((longAt(theIPPtr)) > (longAt(theFP + FoxMethod)))) { + && ((longAt(theIPPtr)) > oop)) { longAtput(theIPPtr, (longAt(theIPPtr)) + delta); } longAtput(theFP + FoxIFSavedIP, (longAt(theFP + FoxIFSavedIP)) + delta); - longAtput(theFP + FoxMethod, followForwarded(oop)); + longAtput(theFP + FoxMethod, (oop = newOop)); } } /* begin followNecessaryForwardingInMethod: */ /* begin literal:ofMethod: */ - offset1 = (literalCountOfHeader(headerOf(longAt(theFP + FoxMethod)))) - 1; - assoc = longAt(((longAt(theFP + FoxMethod)) + BaseHeaderSize) + ((offset1 + LiteralStart) << ShiftForWord)); + offset1 = (literalCountOfHeader(headerOf(oop))) - 1; + assoc = longAt((oop + BaseHeaderSize) + ((offset1 + LiteralStart) << ShiftForWord)); if (isForwarded(assoc)) { assoc = followForwarded(assoc); /* begin setMethodClassAssociationOf:to: */ /* begin storePointer:ofObject:withValue: */ - fieldIndex = ((literalCountOfHeader(headerOf(longAt(theFP + FoxMethod)))) + LiteralStart) - 1; - if ((((usqInt) (longAt(theFP + FoxMethod)))) < (((usqInt) GIV(youngStart)))) { - possibleRootStoreIntovalue(longAt(theFP + FoxMethod), assoc); + fieldIndex = ((literalCountOfHeader(headerOf(oop))) + LiteralStart) - 1; + if ((((usqInt) oop)) < (((usqInt) GIV(youngStart)))) { + possibleRootStoreIntovalue(oop, assoc); } - longAtput(((longAt(theFP + FoxMethod)) + BaseHeaderSize) + (fieldIndex << ShiftForWord), assoc); + longAtput((oop + BaseHeaderSize) + (fieldIndex << ShiftForWord), assoc); } classObj = longAt((assoc + BaseHeaderSize) + (ValueIndex << ShiftForWord)); if (isForwarded(classObj)) { @@ -22613,14 +22612,6 @@ } static sqInt -frameMethodObject(char *theFP) -{ - return ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((mframeHomeMethod(theFP))->methodObject) - : longAt(theFP + FoxMethod)); -} - -static sqInt frameMethod(char *theFP) { return longAt(theFP + FoxMethod); @@ -49487,8 +49478,8 @@ } /* begin setHeapBase:memoryLimit:endOfMemory: */ baseOfHeap = (memory()) + GIV(cogCodeSize); - memLimit = (memory()) + heapSize; - memEnd = (memory()) + dataSize; + memLimit = ((memory()) + GIV(cogCodeSize)) + heapSize; + memEnd = ((memory()) + GIV(cogCodeSize)) + dataSize; /* begin setMemoryLimit: */ assert((memLimit & (BytesPerWord - 1)) == 0); GIV(memoryLimit) = memLimit; Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/nscogsrc/vm/interp.h 2013-12-06 22:44:48 UTC (rev 2820) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-12-06 22:44:48 UTC (rev 2820) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Dec 5 15:20:31 PST 2013 + Fri Dec 6 14:44:27 PST 2013 Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/spursrc/vm/cogit.c 2013-12-06 22:44:48 UTC (rev 2820) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGenerator VMMaker.oscog-eem.538 uuid: 6b6d8ba7-4913-4563-9d01-da880441f843 from - StackToRegisterMappingCogit VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + StackToRegisterMappingCogit VMMaker.oscog-eem.538 uuid: 6b6d8ba7-4913-4563-9d01-da880441f843 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.538 uuid: 6b6d8ba7-4913-4563-9d01-da880441f843 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -131,7 +131,7 @@ #define BlockCreationBytecodeSize 4 #define Call 9 #define CDQ 105 -#define ClassMethodContextCompactIndex 14 +#define ClassMethodContextCompactIndex 36 #define ClassReg -5 #define ClosureFirstCopiedValueIndex 3 #define ClosureNumArgsIndex 2 @@ -1637,7 +1637,7 @@ static sqInt sendTrampolines[NumSendTrampolines]; static CogSimStackEntry simSelf; static sqInt simSpillBase; -static CogSimStackEntry simStack[78]; +static CogSimStackEntry simStack[80]; static sqInt simStackPtr; static AbstractInstruction * stackCheckLabel; static AbstractInstruction * stackOverflowCall; Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/spursrc/vm/cogit.h 2013-12-06 22:44:48 UTC (rev 2820) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGenerator VMMaker.oscog-eem.538 uuid: 6b6d8ba7-4913-4563-9d01-da880441f843 */ Modified: branches/Cog/spursrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursrc/vm/cogmethod.h 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/spursrc/vm/cogmethod.h 2013-12-06 22:44:48 UTC (rev 2820) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGenerator VMMaker.oscog-eem.538 uuid: 6b6d8ba7-4913-4563-9d01-da880441f843 */ typedef struct { Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/spursrc/vm/cointerp.c 2013-12-06 22:44:48 UTC (rev 2820) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 from - CoInterpreter VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CoInterpreter VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -628,7 +628,6 @@ static sqInt frameContext(char *theFP); static sqInt frameHasContext(char *theFP); static sqInt frameIsBlockActivation(char *theFP); -static sqInt frameMethodObject(char *theFP); static sqInt frameMethod(char *theFP); static sqInt frameNumArgs(char *theFP); static char * frameOfMarriedContext(sqInt aContext); @@ -1182,6 +1181,9 @@ void printMethodReferencesTo(sqInt anOop); static void printNameOfClasscount(sqInt classOop, sqInt cnt); static void printNum(sqInt n); +static void printObjStackPagemyIndexpageType(sqInt objStackPage, sqInt myx, sqInt pageType); +static void printObjStackPagemyIndextag(sqInt objStackPage, sqInt myx, char *pageType); +void printObjStack(sqInt objStack); static void printOopShort(sqInt oop); void printOop(sqInt oop); static sqInt printPrimLogEntryAt(sqInt i); @@ -1426,10 +1428,10 @@ _iss sqInt ephemeronList; _iss sqInt needGCFlag; _iss sqInt tempOop; +_iss char * objStackInvalidBecause; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; _iss sqInt longRunningPrimitiveCheckMethod; -_iss char * objStackInvalidBecause; _iss sqInt ephemeronQueue; _iss sqInt extraRootCount; _iss sqInt lastMethodCacheProbeWrite; @@ -1446,6 +1448,7 @@ _iss usqLong longRunningPrimitiveStopUsecs; _iss sqInt numSegInfos; _iss sqInt statCheckForEvents; +_iss sqInt cogCodeSize; _iss sqInt gcMode; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; @@ -1460,7 +1463,6 @@ _iss sqInt statIOProcessEvents; _iss sqInt weakList; _iss sqInt backwardJumpCount; -_iss sqInt cogCodeSize; _iss usqLong gcStartUsecs; _iss usqInt memory; _iss sqInt noThreadingOfGUIThread; @@ -2151,7 +2153,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.536]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.545]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6352,6 +6354,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } + null; goto l4; } if (opType == 3) { @@ -6361,6 +6364,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l4; } if (opType == 4) { @@ -6388,6 +6392,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); + null; goto l4; } top = longAtPointer(localSP); @@ -19073,8 +19078,7 @@ default: error("Case not found and no otherwise clause"); } - assert(isValidObjStack(freeOrNewPage)); - return freeOrNewPage; + stackOrNil = freeOrNewPage; } assert(isValidObjStackAt(objStackRootIndex)); return stackOrNil; @@ -22733,7 +22737,6 @@ default: error("Case not found and no otherwise clause"); } - assert(isValidObjStack(stackOrNil)); stackOrNil; } firstPage = stackOrNil; @@ -22888,11 +22891,13 @@ char *callerFP; sqInt delta; sqInt i; + sqInt newOop; sqInt numArgs; sqInt offset; - sqInt oop; + usqInt oop; sqInt referent; sqInt referent1; + sqInt referent2; char *theFP; usqInt theIPPtr; StackPage *thePage; @@ -22960,12 +22965,13 @@ longAtput(theFP + FoxThisContext, followForwarded(longAt(theFP + FoxThisContext))); } if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { - oop = longAt(theFP + FoxIFReceiver); + oop = longAt(theFP + FoxMFReceiver); if (((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == 8)) { - longAtput(theFP + FoxIFReceiver, followForwarded(oop)); + longAtput(theFP + FoxMFReceiver, followForwarded(oop)); } - assert(!(isForwarded(frameMethodObject(theFP)))); + oop = ((mframeHomeMethod(theFP))->methodObject); + assert(!(isForwarded(oop))); } else { oop = longAt(theFP + FoxIFReceiver); @@ -22975,16 +22981,24 @@ } oop = longAt(theFP + FoxMethod); if (((longAt(oop)) & 0x3FFFFF) == 8) { - delta = (followForwarded(oop)) - oop; + /* begin followForwarded: */ + assert(isForwarded(oop)); + referent2 = longAt((oop + (BaseHeaderSize)) + (0 << 2)); + while (((referent2 & 3) == 0) + && (((longAt(referent2)) & 0x3FFFFF) == 8)) { + referent2 = longAt((referent2 + (BaseHeaderSize)) + (0 << 2)); + } + newOop = referent2; + delta = newOop - oop; if ((theIPPtr != 0) - && ((longAt(theIPPtr)) > (longAt(theFP + FoxMethod)))) { + && ((longAt(theIPPtr)) > oop)) { longAtput(theIPPtr, (longAt(theIPPtr)) + delta); } longAtput(theFP + FoxIFSavedIP, (longAt(theFP + FoxIFSavedIP)) + delta); - longAtput(theFP + FoxMethod, followForwarded(oop)); + longAtput(theFP + FoxMethod, (oop = newOop)); } } - followNecessaryForwardingInMethod(longAt(theFP + FoxMethod)); + followNecessaryForwardingInMethod(oop); if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP)); theFP = callerFP; @@ -23303,14 +23317,6 @@ } static sqInt -frameMethodObject(char *theFP) -{ - return ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((mframeHomeMethod(theFP))->methodObject) - : longAt(theFP + FoxMethod)); -} - -static sqInt frameMethod(char *theFP) { return longAt(theFP + FoxMethod); @@ -26454,6 +26460,7 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt freeOrNextPage; sqInt index; + char *ns; if (!(isValidObjStackPagemyIndex(objStackPage, myx))) { return 0; @@ -26466,7 +26473,10 @@ return 0; } if (!(isValidObjStackPagemyIndex(freeOrNextPage, myx))) { - GIV(objStackInvalidBecause) = strcat(GIV(objStackInvalidBecause), ", on next page"); + ns = malloc(((strlen(GIV(objStackInvalidBecause))) + (strlen(", on next page"))) + 2); + strcpy(ns, GIV(objStackInvalidBecause)); + GIV(objStackInvalidBecause) = strcat(ns, ", on next page"); + return 0; } freeOrNextPage = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); @@ -31432,9 +31442,9 @@ default: error("Case not found and no otherwise clause"); } - assert(isValidObjStack(nextPage)); nextPage; } + assert(isValidObjStack(objStack)); return top; } @@ -50071,6 +50081,94 @@ } static void +printObjStackPagemyIndexpageType(sqInt objStackPage, sqInt myx, sqInt pageType) +{ + sqInt freeOrNextPage; + sqInt isFirstPage; + sqInt isFreePage; + sqInt isNextPage; + + isFirstPage = pageType == ObjStackMyx; + isNextPage = pageType == ObjStackNextx; + isFreePage = pageType == ObjStackFreex; + printObjStackPagemyIndextag(objStackPage, myx, (isFirstPage + ? "head" + : (isFreePage + ? "free" + : "next"))); + if (isFirstPage + || (isNextPage)) { + /* begin tab */ + /* begin printChar: */ + putchar(' '); + print("next: "); + printHex(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2))); + if (isFirstPage) { + print(" free: "); + printHex(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackFreex << 2))); + } + /* begin cr */ + printf("\n"); + } + freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + while (freeOrNextPage != 0) { + printObjStackPagemyIndexpageType(freeOrNextPage, myx, ObjStackFreex); + freeOrNextPage = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + } + freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)); + if (freeOrNextPage != 0) { + printObjStackPagemyIndexpageType(freeOrNextPage, myx, ObjStackNextx); + } +} + +static void +printObjStackPagemyIndextag(sqInt objStackPage, sqInt myx, char *pageType) +{ + print(pageType); + /* begin space */ + /* begin printChar: */ + putchar(' '); + printHex(objStackPage); + /* begin space */ + /* begin printChar: */ + putchar(' '); + print("cx "); + printNum((longAt(objStackPage)) & 0x3FFFFF); + print(" ("); + printNum(18); + print(") fmt "); + printNum((((usqInt) (longAt(objStackPage))) >> 24) & 0x1F); + print(" ("); + printNum(10); + print(") sz "); + printNum(numSlotsOfAny(objStackPage)); + print(" ("); + printNum(ObjStackPageSlots); + print(") myx: "); + printNum(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackMyx << 2))); + print(" ("); + printNum(myx); + print((isMarked(objStackPage) + ? ") mkd" + : ") unmkd")); + /* begin cr */ + printf("\n"); +} + +void +printObjStack(sqInt objStack) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + if (objStack == GIV(nilObj)) { + print("nil"); + /* begin cr */ + printf("\n"); + } + else { + printObjStackPagemyIndexpageType(objStack, longAt((objStack + (BaseHeaderSize)) + (ObjStackMyx << 2)), ObjStackMyx); + } +} + +static void printOopShort(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classIndex; @@ -51929,8 +52027,8 @@ } /* begin setHeapBase:memoryLimit:endOfMemory: */ baseOfHeap = (memory()) + GIV(cogCodeSize); - memLimit = (memory()) + heapSize; - memEnd = (memory()) + dataSize; + memLimit = ((memory()) + GIV(cogCodeSize)) + heapSize; + memEnd = ((memory()) + GIV(cogCodeSize)) + dataSize; GIV(newSpaceStart) = baseOfHeap; GIV(newSpaceLimit) = (baseOfHeap + edenBytes) + (interpreterAllocationReserveBytes()); /* begin newSpaceStart:newSpaceBytes:edenBytes: */ Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/spursrc/vm/cointerp.h 2013-12-06 22:44:48 UTC (rev 2820) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 */ @@ -198,6 +198,7 @@ void printMethodDictionaryOf(sqInt behavior); void printMethodDictionary(sqInt dictionary); void printMethodReferencesTo(sqInt anOop); +void printObjStack(sqInt objStack); void printProcessStack(sqInt aProcess); sqInt printProcsOnList(sqInt procList); void printReferencesTo(sqInt anOop); Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-06 22:44:48 UTC (rev 2820) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 from - CoInterpreter VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CoInterpreter VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -631,7 +631,6 @@ static sqInt frameContext(char *theFP); static sqInt frameHasContext(char *theFP); static sqInt frameIsBlockActivation(char *theFP); -static sqInt frameMethodObject(char *theFP); static sqInt frameMethod(char *theFP); static sqInt frameNumArgs(char *theFP); static char * frameOfMarriedContext(sqInt aContext); @@ -1185,6 +1184,9 @@ void printMethodReferencesTo(sqInt anOop); static void printNameOfClasscount(sqInt classOop, sqInt cnt); static void printNum(sqInt n); +static void printObjStackPagemyIndexpageType(sqInt objStackPage, sqInt myx, sqInt pageType); +static void printObjStackPagemyIndextag(sqInt objStackPage, sqInt myx, char *pageType); +void printObjStack(sqInt objStack); static void printOopShort(sqInt oop); void printOop(sqInt oop); static sqInt printPrimLogEntryAt(sqInt i); @@ -1429,10 +1431,10 @@ _iss sqInt ephemeronList; _iss sqInt needGCFlag; _iss sqInt tempOop; +_iss char * objStackInvalidBecause; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; _iss sqInt longRunningPrimitiveCheckMethod; -_iss char * objStackInvalidBecause; _iss sqInt ephemeronQueue; _iss sqInt extraRootCount; _iss sqInt lastMethodCacheProbeWrite; @@ -1449,6 +1451,7 @@ _iss usqLong longRunningPrimitiveStopUsecs; _iss sqInt numSegInfos; _iss sqInt statCheckForEvents; +_iss sqInt cogCodeSize; _iss sqInt gcMode; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; @@ -1463,7 +1466,6 @@ _iss sqInt statIOProcessEvents; _iss sqInt weakList; _iss sqInt backwardJumpCount; -_iss sqInt cogCodeSize; _iss usqLong gcStartUsecs; _iss usqInt memory; _iss sqInt noThreadingOfGUIThread; @@ -2154,7 +2156,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.536]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.545]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6361,6 +6363,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } + null; goto l4; } if (opType == 3) { @@ -6370,6 +6373,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l4; } if (opType == 4) { @@ -6397,6 +6401,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); + null; goto l4; } top = longAtPointer(localSP); @@ -19082,8 +19087,7 @@ default: error("Case not found and no otherwise clause"); } - assert(isValidObjStack(freeOrNewPage)); - return freeOrNewPage; + stackOrNil = freeOrNewPage; } assert(isValidObjStackAt(objStackRootIndex)); return stackOrNil; @@ -22742,7 +22746,6 @@ default: error("Case not found and no otherwise clause"); } - assert(isValidObjStack(stackOrNil)); stackOrNil; } firstPage = stackOrNil; @@ -22897,11 +22900,13 @@ char *callerFP; sqInt delta; sqInt i; + sqInt newOop; sqInt numArgs; sqInt offset; - sqInt oop; + usqInt oop; sqInt referent; sqInt referent1; + sqInt referent2; char *theFP; usqInt theIPPtr; StackPage *thePage; @@ -22969,12 +22974,13 @@ longAtput(theFP + FoxThisContext, followForwarded(longAt(theFP + FoxThisContext))); } if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { - oop = longAt(theFP + FoxIFReceiver); + oop = longAt(theFP + FoxMFReceiver); if (((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == 8)) { - longAtput(theFP + FoxIFReceiver, followForwarded(oop)); + longAtput(theFP + FoxMFReceiver, followForwarded(oop)); } - assert(!(isForwarded(frameMethodObject(theFP)))); + oop = ((mframeHomeMethod(theFP))->methodObject); + assert(!(isForwarded(oop))); } else { oop = longAt(theFP + FoxIFReceiver); @@ -22984,16 +22990,24 @@ } oop = longAt(theFP + FoxMethod); if (((longAt(oop)) & 0x3FFFFF) == 8) { - delta = (followForwarded(oop)) - oop; + /* begin followForwarded: */ + assert(isForwarded(oop)); + referent2 = longAt((oop + (BaseHeaderSize)) + (0 << 2)); + while (((referent2 & 3) == 0) + && (((longAt(referent2)) & 0x3FFFFF) == 8)) { + referent2 = longAt((referent2 + (BaseHeaderSize)) + (0 << 2)); + } + newOop = referent2; + delta = newOop - oop; if ((theIPPtr != 0) - && ((longAt(theIPPtr)) > (longAt(theFP + FoxMethod)))) { + && ((longAt(theIPPtr)) > oop)) { longAtput(theIPPtr, (longAt(theIPPtr)) + delta); } longAtput(theFP + FoxIFSavedIP, (longAt(theFP + FoxIFSavedIP)) + delta); - longAtput(theFP + FoxMethod, followForwarded(oop)); + longAtput(theFP + FoxMethod, (oop = newOop)); } } - followNecessaryForwardingInMethod(longAt(theFP + FoxMethod)); + followNecessaryForwardingInMethod(oop); if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP)); theFP = callerFP; @@ -23312,14 +23326,6 @@ } static sqInt -frameMethodObject(char *theFP) -{ - return ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((mframeHomeMethod(theFP))->methodObject) - : longAt(theFP + FoxMethod)); -} - -static sqInt frameMethod(char *theFP) { return longAt(theFP + FoxMethod); @@ -26463,6 +26469,7 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt freeOrNextPage; sqInt index; + char *ns; if (!(isValidObjStackPagemyIndex(objStackPage, myx))) { return 0; @@ -26475,7 +26482,10 @@ return 0; } if (!(isValidObjStackPagemyIndex(freeOrNextPage, myx))) { - GIV(objStackInvalidBecause) = strcat(GIV(objStackInvalidBecause), ", on next page"); + ns = malloc(((strlen(GIV(objStackInvalidBecause))) + (strlen(", on next page"))) + 2); + strcpy(ns, GIV(objStackInvalidBecause)); + GIV(objStackInvalidBecause) = strcat(ns, ", on next page"); + return 0; } freeOrNextPage = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); @@ -31441,9 +31451,9 @@ default: error("Case not found and no otherwise clause"); } - assert(isValidObjStack(nextPage)); nextPage; } + assert(isValidObjStack(objStack)); return top; } @@ -50080,6 +50090,94 @@ } static void +printObjStackPagemyIndexpageType(sqInt objStackPage, sqInt myx, sqInt pageType) +{ + sqInt freeOrNextPage; + sqInt isFirstPage; + sqInt isFreePage; + sqInt isNextPage; + + isFirstPage = pageType == ObjStackMyx; + isNextPage = pageType == ObjStackNextx; + isFreePage = pageType == ObjStackFreex; + printObjStackPagemyIndextag(objStackPage, myx, (isFirstPage + ? "head" + : (isFreePage + ? "free" + : "next"))); + if (isFirstPage + || (isNextPage)) { + /* begin tab */ + /* begin printChar: */ + putchar(' '); + print("next: "); + printHex(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2))); + if (isFirstPage) { + print(" free: "); + printHex(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackFreex << 2))); + } + /* begin cr */ + printf("\n"); + } + freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + while (freeOrNextPage != 0) { + printObjStackPagemyIndexpageType(freeOrNextPage, myx, ObjStackFreex); + freeOrNextPage = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + } + freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)); + if (freeOrNextPage != 0) { + printObjStackPagemyIndexpageType(freeOrNextPage, myx, ObjStackNextx); + } +} + +static void +printObjStackPagemyIndextag(sqInt objStackPage, sqInt myx, char *pageType) +{ + print(pageType); + /* begin space */ + /* begin printChar: */ + putchar(' '); + printHex(objStackPage); + /* begin space */ + /* begin printChar: */ + putchar(' '); + print("cx "); + printNum((longAt(objStackPage)) & 0x3FFFFF); + print(" ("); + printNum(18); + print(") fmt "); + printNum((((usqInt) (longAt(objStackPage))) >> 24) & 0x1F); + print(" ("); + printNum(10); + print(") sz "); + printNum(numSlotsOfAny(objStackPage)); + print(" ("); + printNum(ObjStackPageSlots); + print(") myx: "); + printNum(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackMyx << 2))); + print(" ("); + printNum(myx); + print((isMarked(objStackPage) + ? ") mkd" + : ") unmkd")); + /* begin cr */ + printf("\n"); +} + +void +printObjStack(sqInt objStack) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + if (objStack == GIV(nilObj)) { + print("nil"); + /* begin cr */ + printf("\n"); + } + else { + printObjStackPagemyIndexpageType(objStack, longAt((objStack + (BaseHeaderSize)) + (ObjStackMyx << 2)), ObjStackMyx); + } +} + +static void printOopShort(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classIndex; @@ -51938,8 +52036,8 @@ } /* begin setHeapBase:memoryLimit:endOfMemory: */ baseOfHeap = (memory()) + GIV(cogCodeSize); - memLimit = (memory()) + heapSize; - memEnd = (memory()) + dataSize; + memLimit = ((memory()) + GIV(cogCodeSize)) + heapSize; + memEnd = ((memory()) + GIV(cogCodeSize)) + dataSize; GIV(newSpaceStart) = baseOfHeap; GIV(newSpaceLimit) = (baseOfHeap + edenBytes) + (interpreterAllocationReserveBytes()); /* begin newSpaceStart:newSpaceBytes:edenBytes: */ Modified: branches/Cog/spursrc/vm/interp.h =================================================================== --- branches/Cog/spursrc/vm/interp.h 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/spursrc/vm/interp.h 2013-12-06 22:44:48 UTC (rev 2820) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursrc/vm/vmCallback.h 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/spursrc/vm/vmCallback.h 2013-12-06 22:44:48 UTC (rev 2820) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-12-05 23:21:33 UTC (rev 2819) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-12-06 22:44:48 UTC (rev 2820) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.533 uuid: 596ae385-70cc-4593-98e9-244920c6d7d2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 from - StackInterpreter VMMaker.oscog-eem.533 uuid: 596ae385-70cc-4593-98e9-244920c6d7d2 + StackInterpreter VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.533 uuid: 596ae385-70cc-4593-98e9-244920c6d7d2 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.545 uuid: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -506,6 +506,7 @@ sqInt floatObjectOf(double aFloat); double floatValueOf(sqInt oop); static sqInt flushExternalPrimitiveOf(sqInt methodObj); +static sqInt followFieldofObject(sqInt fieldIndex, sqInt anObject); static void followForwardedFrameContentsstackPointer(char *theFP, char *theSP); static sqInt followForwardedInObjStackatIndex(sqInt objStack, sqInt objStackRootIndex); static void followForwardedObjectFieldstoDepth(sqInt objOop, sqInt depth); @@ -1017,6 +1018,9 @@ void printMethodReferencesTo(sqInt anOop); static void printNameOfClasscount(sqInt classOop, sqInt cnt); static void printNum(sqInt n); +static void printObjStackPagemyIndexpageType(sqInt objStackPage, sqInt myx, sqInt pageType); +static void printObjStackPagemyIndextag(sqInt objStackPage, sqInt myx, char *pageType); +void printObjStack(sqInt objStack); static void printOopShort(sqInt oop); void printOop(sqInt oop); void printProcessStack(sqInt aProcess); @@ -1201,8 +1205,8 @@ _iss usqInt instructionPointer; _iss SpurCircularBuffer highestObjects; _iss sqInt totalFreeOldSpace; +_iss usqInt endOfMemory; _iss sqInt remapBufferCount; -_iss usqInt endOfMemory; _iss sqInt trueObj; _iss sqInt falseObj; _iss sqInt * freeLists; @@ -1239,11 +1243,11 @@ _iss sqInt needGCFlag; _iss sqInt numPages; _iss sqInt tempOop; +_iss char * objStackInvalidBecause; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt longRunningPrimitiveCheckSemaphore; -_iss char * objStackInvalidBecause; _iss sqInt ephemeronQueue; _iss sqInt extraRootCount; _iss sqInt lastMethodCacheProbeWrite; @@ -1945,7 +1949,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.533]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.545]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -7151,7 +7155,7 @@ localSP = pointerForOop(GIV(stackPointer)); localFP = pointerForOop(GIV(framePointer)); if (popValues) { - for (i = 0; i <= (size - 1); i += 1) { + for (i = 0; i < size; i += 1) { /* Assume: have just allocated a new Array; it must be young. Thus, can use unchecked stores. */ @@ -7163,7 +7167,7 @@ localSP += size * BytesPerOop; } else { - for (i = 0; i <= (size - 1); i += 1) { + for (i = 0; i < size; i += 1) { /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(array))); longAtput((array + (BaseHeaderSize)) + (i << 2), GIV(nilObj)); @@ -7363,7 +7367,7 @@ longAtput((newClosure1 + (BaseHeaderSize)) + (ClosureNumArgsIndex << 2), ((numArgs << 1) | 1)); newClosure = newClosure1; if (numCopied > 0) { - for (i = 0; i <= (numCopied - 1); i += 1) { + for (i = 0; i < numCopied; i += 1) { /* Assume: have just allocated a new BlockClosure; it must be young. Thus, can use unchecked stores. */ @@ -11158,7 +11162,7 @@ else { primitiveFunctionPointer = primitiveInvokeObjectAsMethod; } - for (p = 0; p <= (CacheProbeMax - 1); p += 1) { + for (p = 0; p < CacheProbeMax; p += 1) { probe = (((usqInt) hash) >> p) & MethodCacheMask; if ((GIV(methodCache)[probe + MethodCacheSelector]) == 0) { @@ -11188,7 +11192,7 @@ /* ...and zap the following entries */ GIV(lastMethodCacheProbeWrite) = probe; - for (p = 1; p <= (CacheProbeMax - 1); p += 1) { + for (p = 1; p < CacheProbeMax; p += 1) { probe = (((usqInt) hash) >> p) & MethodCacheMask; GIV(methodCache)[probe + MethodCacheSelector] = 0; } @@ -11306,7 +11310,7 @@ freeChunkWithBytesat(allocatedSize - (2 * (BaseHeaderSize)), address); GIV(totalFreeOldSpace) += allocatedSize - (2 * (BaseHeaderSize)); assert((addressAfter(objectStartingAt((newSeg->segStart)))) == ((segLimit(newSeg)) - (bridgeSize()))); - for (i = 0; i <= (GIV(numSegments) - 1); i += 1) { + for (i = 0; i < GIV(numSegments); i += 1) { assert(isInSegments(((GIV(segments)[i]).segStart))); assert(isInSegments((segLimit(&GIV(segments)[i])) - (wordSize()))); assert((!(isInSegments(segLimit(&GIV(segments)[i])))) @@ -11481,7 +11485,7 @@ SpurSegmentInfo *segInfo; oldBaseAddr = GIV(oldSpaceStart) - firstSegmentShift; - for (i = 0; i <= (GIV(numSegments) - 1); i += 1) { + for (i = 0; i < GIV(numSegments); i += 1) { segInfo = (&(GIV(segments)[i])); (segInfo->segStart = ((segInfo->segStart)) + oldBaseAddr); (segInfo->swizzle = ((segInfo->swizzle)) - oldBaseAddr); @@ -11497,7 +11501,7 @@ sqInt i; usqInt numSlots; - for (i = 0; i <= (GIV(numSegments) - 1); i += 1) { + for (i = 0; i < GIV(numSegments); i += 1) { /* begin objectStartingAt: */ address = (((((&(GIV(segments)[i])))->segSize)) + ((((&(GIV(segments)[i])))->segStart))) - (2 * (BaseHeaderSize)); /* begin rawNumSlotsOf: */ @@ -14187,7 +14191,7 @@ flag("no support for remembered set overflow yet"); } /* begin rememberedSetWithIndexDo: */ - for (i1 = 0; i1 <= (GIV(rememberedSetSize) - 1); i1 += 1) { + for (i1 = 0; i1 < GIV(rememberedSetSize); i1 += 1) { if (((GIV(rememberedSet)[i1]) & ((wordSize()) - 1)) != 0) { print("misaligned oop in remembered set @ "); printNum(i1); @@ -14550,7 +14554,7 @@ ok = ok && (checkOkayFields(GIV(messageSelector))); ok = ok && (checkOkayFields(GIV(newMethod))); ok = ok && (checkOkayFields(GIV(lkupClass))); - for (i = 0; i <= (MethodCacheEntries - 1); i += MethodCacheEntrySize) { + for (i = 0; i < MethodCacheEntries; i += MethodCacheEntrySize) { oopOrZero = GIV(methodCache)[i + MethodCacheSelector]; if (!(oopOrZero == 0)) { ok = ok && (checkOkayFields(GIV(methodCache)[i + MethodCacheSelector])); @@ -14719,7 +14723,7 @@ assert(pageListIsWellFormed()); } ok = 1; - for (i = 0; i <= (GIV(numStackPages) - 1); i += 1) { + for (i = 0; i < GIV(numStackPages); i += 1) { /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(isFree(thePage))) { @@ -14855,7 +14859,7 @@ char *theSP; ok = 1; - for (i = 0; i <= (GIV(numStackPages) - 1); i += 1) { + for (i = 0; i < GIV(numStackPages); i += 1) { /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(isFree(thePage))) { @@ -15115,7 +15119,7 @@ } length = stSizeOf(name); srcName = ((char *) (arrayValueOf(name))); - for (i = 0; i <= (length - 1); i += 1) { + for (i = 0; i < length; i += 1) { if (!((srcName[i]) == (className[i]))) { return 0; } @@ -15463,7 +15467,7 @@ l1: /* end allocateSlots:format:classIndex: */; } if (((((usqInt) (longAt(objOop))) >> 24) & 0x1F) <= 5) { - for (i = 0; i <= (numSlots - 1); i += 1) { + for (i = 0; i < numSlots; i += 1) { oop = longAt((objOop + (BaseHeaderSize)) + (i << 2)); if (((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == 8)) { @@ -15489,7 +15493,7 @@ } } else { - for (i = 0; i <= (numSlots - 1); i += 1) { + for (i = 0; i < numSlots; i += 1) { /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(newObj))); longAtput((newObj + (BaseHeaderSize)) + (i << 2), longAt((objOop + (BaseHeaderSize)) + (i << 2))); @@ -16331,7 +16335,7 @@ } activeContext = marryFrameSP(GIV(framePointer), GIV(stackPointer)); l1: /* end ensureFrameIsMarried:SP: */; - for (i = 0; i <= (GIV(numStackPages) - 1); i += 1) { + for (i = 0; i < GIV(numStackPages); i += 1) { /* begin stackPageAt: */ aPage = stackPageAtpages(i, GIV(pages)); if (!(isFree(aPage))) { @@ -16753,7 +16757,7 @@ /* begin initSpaceForAllocationCheck: */ aNewSpace = (&(eden())); if (!(GIV(memory) == null)) { @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.545.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.545.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.545 Author: eem Time: 6 December 2013, 2:35:20.154 pm UUID: 36659c65-ab43-4cb4-8f2f-9fecfadfa4d9 Ancestors: VMMaker.oscog-eem.544 Ghhhaaa =============== Diff against VMMaker.oscog-eem.544 =============== Item was changed: ----- Method: VMMaker class>>generateAllConfigurationsUnderVersionControl (in category 'configurations') ----- generateAllConfigurationsUnderVersionControl self generateNewspeakCogVM; + generateSqueakCogVM; + generateSqueakCogMTVM; - generateSqueakCogVMWithInterpreterClass: CoInterpreter; - generateSqueakCogVMWithInterpreterClass: CoInterpreterMT; generateSqueakStackVM; generateSqueakSpurCogVM; generateSqueakSpurStackVM!

1 0

← Newer
1
...
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2013