Vm-dev August 2012

vm-dev@lists.squeakfoundation.org

18 participants
60 discussions

[commit] r2590 - tweak some dependencies for the Newspeak installer.
by commits＠squeakvm.org 24 Aug '12

24 Aug '12

Author: eliot Date: 2012-08-24 14:48:53 -0700 (Fri, 24 Aug 2012) New Revision: 2590 Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Makefile branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk Log: tweak some dependencies for the Newspeak installer. Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Makefile =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2012-08-24 20:42:26 UTC (rev 2589) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2012-08-24 21:48:53 UTC (rev 2590) @@ -29,7 +29,7 @@ SED := /usr/bin/sed WINDRES := /usr/bin/windres -icon.o: ../nsvm.rc +icon.o: ../$(VM_BASE_NAME).rc $(WINDRES) --include-dir=.. --define _WIN32 -l 0 -i $< -o $@ $(VM_EXECUTABLE): ../build/vm/$(VM_EXECUTABLE) Modified: branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2012-08-24 20:42:26 UTC (rev 2589) +++ branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2012-08-24 21:48:53 UTC (rev 2590) @@ -53,12 +53,14 @@ SOURCES_IDTS += FeatureComponents.idt File.idt : File-with-sources.idt.in files.ddf : files-with-sources.ddf.in +files.cab: files.ddf $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(VM_EXECUTABLE_MANIFEST) $(SOURCEFILENAME1) else REGULAR_IDTS += Directory.idt REGULAR_IDTS += Component.idt REGULAR_IDTS += FeatureComponents.idt File.idt : File.idt.in -files.ddf : files.ddf.in $(DOCUMENTATION_INDEX) $(DOCUMENTATION_FILES) +files.ddf : files.ddf.in $(DOCUMENTATION_FILES) $(DOCUMENTATION_INDEX) +files.cab : files.ddf $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(VM_EXECUTABLE_MANIFEST) endif IDTS := File.idt $(REGULAR_IDTS) $(SOURCES_IDTS) @@ -117,13 +119,13 @@ @echo $(DOCUMENTATION_INDEX) $(DOCUMENTATION_FILES) | xargs -n 1 >> $@.tmp mv $@.tmp $@ -File.idt: $(DOCUMENTATION_FILES) +File.idt: Makefile File.idt: $(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@.tmp echo $(foreach docfile,$(strip $(DOCUMENTATION_FILES)), '$(notdir $(docfile))' '$(call dosname,$(notdir $(docfile)))' '$(notdir $(docfile))') | xargs -r -n 3 printf '%s\tDocumentation\t%s|%s\t0\t\t\t16896\t1\n' >> $@.tmp mv $@.tmp $@ -files.cab: files.ddf $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(VM_EXECUTABLE_MANIFEST) $(DOCUMENTATION_FILES) $(SOURCEFILENAME1) +files.cab: makecab /D SourcesDir='$(shell cygpath -wa .)' /f $< @echo

1 0

[commit] r2589 - tweak Newspeak install (prune .map file).
by commits＠squeakvm.org 24 Aug '12

24 Aug '12

Author: eliot Date: 2012-08-24 13:42:26 -0700 (Fri, 24 Aug 2012) New Revision: 2589 Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Makefile branches/Cog/nscogbuild/cygwinbuild/installer/links Log: tweak Newspeak install (prune .map file). Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Makefile =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2012-08-24 20:33:58 UTC (rev 2588) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2012-08-24 20:42:26 UTC (rev 2589) @@ -38,7 +38,7 @@ $(VM_EXECUTABLE_MAP): ../build/vm/$(VM_EXECUTABLE_MAP) rm -f $@ - cp $< $@ + grep " [tT] " $< | grep -v ' t \.text$' >$@ $(VM_EXECUTABLE_MANIFEST): ../build/vm/$(VM_EXECUTABLE_MANIFEST) rm -f $@ Modified: branches/Cog/nscogbuild/cygwinbuild/installer/links =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/links 2012-08-24 20:33:58 UTC (rev 2588) +++ branches/Cog/nscogbuild/cygwinbuild/installer/links 2012-08-24 20:42:26 UTC (rev 2589) @@ -1,11 +1,9 @@ #!/bin/sh if [ "$1" = rm -o "$1" = mk ]; then - rm SqueakV41.sources nsvm.exe nsvm.map + rm SqueakV41.sources fi if [ "$1" = mk ]; then ln ~/Squeak/SqueakV41.sources . - ln ../build/vm/nsvm.exe . - grep " [tT] " ../build/vm/nsvm.map | grep -v ' t \.text$' >nsvm.map fi if [ $ "$1" != rm $ -a $ "$1" != mk $ ]; then echo usage: $0 'mk|rm'

1 0

[commit] r2588 - Fix the Newspeak installer to include the manifest file.
by commits＠squeakvm.org 24 Aug '12

24 Aug '12

Author: eliot Date: 2012-08-24 13:33:58 -0700 (Fri, 24 Aug 2012) New Revision: 2588 Added: branches/Cog/nscogbuild/cygwinbuild/installer/files-with-sources.ddf.in Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/Makefile branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in branches/Cog/nscogbuild/cygwinbuild/installer/index.html branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk Log: Fix the Newspeak installer to include the manifest file. Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -2,6 +2,5 @@ s72 S38 s72 i2 S255 S72 Component Component AdvertisedShortcut {@@FRESH_GUID1@@} BASEAPPDIR 0 @@VM_EXECUTABLE@@ -Support1 {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MAP@@ -Support2 {@@FRESH_GUID3@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MANIFEST@@ -Sources {@@FRESH_GUID4@@} BASEAPPDIR 0 @@SOURCEFILENAME1@@ +Support {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MANIFEST@@ +Sources {@@FRESH_GUID3@@} BASEAPPDIR 0 @@SOURCEFILENAME1@@ Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -2,6 +2,5 @@ s72 S38 s72 i2 S255 S72 Component Component AdvertisedShortcut {@@FRESH_GUID1@@} BASEAPPDIR 0 @@VM_EXECUTABLE@@ -Support1 {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MAP@@ -Support2 {@@FRESH_GUID3@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MANIFEST@@ -Documentation {@@FRESH_GUID4@@} DOCDIR 0 index.html +Support {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MANIFEST@@ +Documentation {@@FRESH_GUID3@@} DOCDIR 0 index.html Modified: branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -2,6 +2,5 @@ s38 s72 FeatureComponents Feature_ Component_ Typical AdvertisedShortcut +Typical Support Typical Sources -Typical Support1 -Typical Support2 Modified: branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -2,5 +2,5 @@ s38 s72 FeatureComponents Feature_ Component_ Typical AdvertisedShortcut -Typical Support1 -Typical Support2 +Typical Support +Typical Documentation Modified: branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -2,6 +2,6 @@ s72 s72 l255 i4 S72 S20 I2 i2 File File @@VM_EXECUTABLE@@ AdvertisedShortcut @@VM_EXECUTABLE@@ 0 16896 1 -@@VM_EXECUTABLE_MAP@@ Support1 @@VM_EXECUTABLE_MAP@@ 0 16896 1 -@@VM_EXECUTABLE_MANIFEST@@ Support2 @@VM_EXECUTABLE_MANIFEST@@ 0 16896 1 +@@VM_EXECUTABLE_MANIFEST@@ Support @@VM_MANIFEST_8DOT3@@|@@VM_EXECUTABLE_MANIFEST@@ 0 16896 1 @@SOURCEFILENAME1@@ Sources source1.src|@@SOURCEFILENAME1@@ 0 16896 1 +@@VM_EXECUTABLE_MAP@@ Support @@VM_EXECUTABLE_MAP@@ 0 16896 1 Modified: branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -2,6 +2,6 @@ s72 s72 l255 i4 S72 S20 I2 i2 File File @@VM_EXECUTABLE@@ AdvertisedShortcut @@VM_EXECUTABLE@@ 0 16896 1 -@@VM_EXECUTABLE_MAP@@ Support1 @@VM_EXECUTABLE_MAP@@ 0 16896 1 -@@VM_EXECUTABLE_MANIFEST@@ Support2 @@VM_EXECUTABLE_MANIFEST@@ 0 16896 1 +@@VM_EXECUTABLE_MANIFEST@@ Support @@VM_MANIFEST_8DOT3@@|@@VM_EXECUTABLE_MANIFEST@@ 0 16896 1 index.html Documentation index.htm|index.html 0 16896 1 +@@VM_EXECUTABLE_MAP@@ Support @@VM_EXECUTABLE_MAP@@ 0 16896 1 Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Makefile =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2012-08-24 20:33:58 UTC (rev 2588) @@ -15,9 +15,15 @@ VM_EXECUTABLE := $(VM_BASE_NAME).exe VM_EXECUTABLE_MAP := $(VM_BASE_NAME).map VM_EXECUTABLE_MANIFEST := $(VM_EXECUTABLE).manifest +VM_MANIFEST_8DOT3 := $(VM_BASE_NAME).man VM_ICON := $(VM_BASE_NAME).ico SOURCEFILENAME1 := SqueakV41.sources +CAB_FILES := $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(VM_EXECUTABLE_MANIFEST) +ifeq ($(strip $(SOURCES)),yes) +CAB_FILES := $(CAB_FILES) $(SOURCEFILENAME1) +endif + CC := /usr/bin/gcc CP := /usr/bin/cp SED := /usr/bin/sed Modified: branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk 2012-08-24 20:33:58 UTC (rev 2588) @@ -2,6 +2,7 @@ SED_RULES += -e 's%@@VM_EXECUTABLE@@%$(VM_EXECUTABLE)%g;' SED_RULES += -e 's%@@VM_EXECUTABLE_MAP@@%$(VM_EXECUTABLE_MAP)%g;' SED_RULES += -e 's%@@VM_EXECUTABLE_MANIFEST@@%$(VM_EXECUTABLE_MANIFEST)%g;' +SED_RULES += -e 's%@@VM_MANIFEST_8DOT3@@%$(VM_MANIFEST_8DOT3)%g;' SED_RULES += -e 's%@@VM_BASE_NAME@@%$(VM_BASE_NAME)%g;' SED_RULES += -e 's%@@PROJECT_REVERSE_DOMAIN@@%$(PROJECT_REVERSE_DOMAIN)%g;' SED_RULES += -e 's%@@VM_ICON@@%$(notdir $(VM_ICON))%g;' Added: branches/Cog/nscogbuild/cygwinbuild/installer/files-with-sources.ddf.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/files-with-sources.ddf.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/files-with-sources.ddf.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -0,0 +1,15 @@ +.Set Cabinet=ON +.Set CabinetNameTemplate=files.cab +.Set Compress=ON +.Set CompressionType=LZX +.Set DiskDirectoryTemplate= +.Set MaxDiskSize=0 +.Set RptFileName=nul +.Set InfFileName=nul +.Set UniqueFiles=ON +; Sequence of files in cabinet must be same as sequence in File table +; see http://msdn.microsoft.com/en-us/library/windows/desktop/aa368596(v=vs.85).a… +@@VM_EXECUTABLE@@ +@@VM_EXECUTABLE_MANIFEST@@ +%SourcesDir%\@@SOURCEFILENAME1@@ @@SOURCEFILENAME1@@ +@@VM_EXECUTABLE_MAP@@ Modified: branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -7,8 +7,9 @@ .Set RptFileName=nul .Set InfFileName=nul .Set UniqueFiles=ON -; For unknown reasons, it is important that the files come in this exact order +; Sequence of files in cabinet must be same as sequence in File table +; see http://msdn.microsoft.com/en-us/library/windows/desktop/aa368596(v=vs.85).a… @@VM_EXECUTABLE@@ +@@VM_EXECUTABLE_MANIFEST@@ +index.html index.html @@VM_EXECUTABLE_MAP@@ -@@VM_EXECUTABLE_MANIFEST@@ -%SourcesDir%\@@SOURCEFILENAME1@@ @@SOURCEFILENAME1@@ Modified: branches/Cog/nscogbuild/cygwinbuild/installer/index.html =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/index.html 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/index.html 2012-08-24 20:33:58 UTC (rev 2588) @@ -5,8 +5,11 @@ <title>Newspeak Documentation</title> </head> <body> + <H3>Newspeak Documentation</H3> <div class="documentationIndex"> - <div class="documentationItem"><a class="localFile" href="newspeak-101.pdf">Tutorial</a></div> + <div class="documentationItem"><a href="http://www.newspeaklanguage.org">Website</a></div> + <div class="documentationItem"><a href="http://bracha.org/newspeak-101.pdf">Tutorial</a></div> + <div class="documentationItem"><a href="http://bracha.org/newspeak-spec.pdf">Specification</a></div> </div> </body> </html> Modified: branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2012-08-24 20:33:58 UTC (rev 2588) @@ -37,8 +37,7 @@ FRESH_GUID_RULE1 = -e 's/@@FRESH_GUID1@@/$(FRESH_GUID)/g;' FRESH_GUID_RULE2 = -e 's/@@FRESH_GUID2@@/$(FRESH_GUID)/g;' FRESH_GUID_RULE3 = -e 's/@@FRESH_GUID3@@/$(FRESH_GUID)/g;' -FRESH_GUID_RULE4 = -e 's/@@FRESH_GUID4@@/$(FRESH_GUID)/g;' -FRESH_GUID_RULE = $(FRESH_GUID_RULE1) $(FRESH_GUID_RULE2) $(FRESH_GUID_RULE3) $(FRESH_GUID_RULE4) +FRESH_GUID_RULE = $(FRESH_GUID_RULE1) $(FRESH_GUID_RULE2) $(FRESH_GUID_RULE3) REGULAR_IDTS := Feature.idt REGULAR_IDTS += Icon.idt @@ -53,11 +52,13 @@ SOURCES_IDTS += Component.idt SOURCES_IDTS += FeatureComponents.idt File.idt : File-with-sources.idt.in +files.ddf : files-with-sources.ddf.in else REGULAR_IDTS += Directory.idt REGULAR_IDTS += Component.idt REGULAR_IDTS += FeatureComponents.idt File.idt : File.idt.in +files.ddf : files.ddf.in $(DOCUMENTATION_INDEX) $(DOCUMENTATION_FILES) endif IDTS := File.idt $(REGULAR_IDTS) $(SOURCES_IDTS) @@ -111,7 +112,7 @@ gcc -mwindows $^ -o $@ strip $@ -files.ddf: files.ddf.in $(DOCUMENTATION_INDEX) $(DOCUMENTATION_FILES) +files.ddf: $(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@.tmp @echo $(DOCUMENTATION_INDEX) $(DOCUMENTATION_FILES) | xargs -n 1 >> $@.tmp mv $@.tmp $@

1 0

VM Maker: VMMaker.oscog-lw.207.mcz
by commits＠source.squeak.org 24 Aug '12

24 Aug '12

Lars Wassermann uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-lw.207.mcz ==================== Summary ==================== Name: VMMaker.oscog-lw.207 Author: lw Time: 24 August 2012, 8:15:36.393 pm UUID: 052f916f-09bd-754b-80f8-2473b0654afb Ancestors: VMMaker.oscog-eem.206 - added a class comment to the ARMCompiler - added CArg0Reg-CArg3Reg register numbers to ARMCompiler class. - moved Temp, Class, Result and RISCTempReg from r0-r3 to r7-r10, because then we don't have to save them when calling back to the Interpreter (they are callee saved). Subsequently, we needed to update the tests. - Reimplemented genPassConst and genPassReg to reflect the correct ARM ABI, and not IA32 ABI. =============== Diff against VMMaker.oscog-eem.206 =============== Item was changed: CogAbstractInstruction subclass: #CogARMCompiler instanceVariableNames: '' + classVariableNames: 'AL CArg0Reg CArg1Reg CArg2Reg CArg3Reg CC CS EQ GE GT HI LDMFD LE LR LS LT MI NE PC PL R0 R1 R10 R11 R12 R2 R3 R4 R5 R6 R7 R8 R9 RISCTempReg SP STMFD VC VS' - classVariableNames: 'AL CC CS EQ GE GT HI LDMFD LE LR LS LT MI NE PC PL R0 R1 R10 R11 R12 R2 R3 R4 R5 R6 R7 R8 R9 RISCTempReg SP STMFD VC VS' poolDictionaries: '' category: 'VMMaker-JIT'! + + !CogARMCompiler commentStamp: 'lw 8/23/2012 19:38' prior: 0! + I generate ARM instructions from CogAbstractInstructions. For reference see + http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.set.architectur… + + The Architecture Reference Manual used is that of version 5, which includes some version 6 instructions. Of those, only pld is used(for PrefetchAw). + + This class does not take any special action to flush the instruction cache on instruction-modification.! Item was changed: ----- Method: CogARMCompiler class>>initialize (in category 'class initialization') ----- initialize "Initialize various ARM instruction-related constants." "CogARMCompiler initialize" | specificOpcodes refs conditionCodes | super initialize. self ~~ CogARMCompiler ifTrue: [^self]. R0 := 0. R1 := 1. R2 := 2. R3 := 3. R4 := 4. R5 := 5. R6 := 6. R7 := 7. R8 := 8. R9 := 9. R10 := 10. R11 := 11. R12 := 12. SP := 13. LR := 14. PC := 15. + CArg0Reg := 0. CArg1Reg := 1. CArg2Reg := 2. CArg3Reg := 3. - RISCTempReg := R3. + RISCTempReg := R10. + "Condition Codes" conditionCodes := #(EQ NE CS CC MI PL VS VC HI LS GE LT GT LE AL). conditionCodes withIndexDo: [ :classVarName :value | self classPool declare: classVarName from: Undeclared; at: classVarName put: value - 1]. "Specific instructions" LastRTLCode isNil ifTrue: [CogRTLOpcodes initialize]. specificOpcodes := #(LDMFD STMFD). refs := (thisContext method literals select: [:l| l isVariableBinding and: [classPool includesKey: l key]]) collect: [:ea| ea key]. (classPool keys reject: [:k| (specificOpcodes includes: k) or: [refs includes: k] or: [conditionCodes includes: k]]) do: [:k| Undeclared declare: k from: classPool]. specificOpcodes withIndexDo: [:classVarName :value| self classPool declare: classVarName from: Undeclared; at: classVarName put: value + LastRTLCode - 1]! Item was changed: ----- Method: CogARMCompiler>>cResultRegister (in category 'abi') ----- cResultRegister "Answer the abstract register for the C result register. Only partially implemented. Works on x86 since TempReg = EAX = C result reg." + ^R0! - ^self abstractRegisterForConcreteRegister: R0! Item was changed: ----- Method: CogARMCompiler>>concreteRegister: (in category 'encoding') ----- concreteRegister: registerIndex "Map a possibly abstract register into a concrete one. Abstract registers (defined in CogAbstractOpcodes) are all negative. If registerIndex is negative assume it is an abstract register." "N.B. According to BSABI, R0-R3 are caller-save, R4-R12 are callee save. + Note that R9 might be a special register for the implementation. In some slides it is refered to as sb. R10 can contain the stack limit (sl), R11 the fp. R12 is an intra-procedure scratch instruction pointer for link purposes. It can also be used. + R10 is used as temporary inside a single abstract opcode implementation" + "R0-R3 are used when calling back to the interpreter. Using them would require saving and restoring their values, so they are omitted so far. R12 is the only unused register at the moment.." - Note that R9 might be a special register for the implementation. In some slides it is refered to as sb. R10 contains the stack limit (sl), R11 the fp. R12 is an intra-procedure scratch instruction pointer for link purposes. - R3 is used as temporary inside a single abstract opcode implementation" - ^registerIndex caseOf: { + [TempReg] -> [R7]. + [ClassReg] -> [R8]. + [ReceiverResultReg] -> [R9]. - [TempReg] -> [R0]. - [ClassReg] -> [R1]. - [ReceiverResultReg] -> [R2]. [SendNumArgsReg] -> [R6]. [SPReg] -> [SP]. [FPReg] -> [R11]. [Arg0Reg] -> [R4]. [Arg1Reg] -> [R5] } otherwise: [self assert: (registerIndex between: R0 and: PC). registerIndex]! Item was changed: ----- Method: CogARMCompiler>>genPassConst:asArgument: (in category 'abi') ----- genPassConst: constant asArgument: zeroRelativeArgIndex + zeroRelativeArgIndex caseOf: { + [0] -> [cogit MoveCq: constant R: CArg0Reg]. + [1] -> [cogit MoveCq: constant R: CArg1Reg]. + [2] -> [cogit MoveCq: constant R: CArg2Reg]. + [3] -> [cogit MoveCq: constant R: CArg3Reg].}. - cogit - MoveCq: constant R: TempReg; - PushR: TempReg. ^0! Item was changed: ----- Method: CogARMCompiler>>genPassReg:asArgument: (in category 'abi') ----- genPassReg: abstractRegister asArgument: zeroRelativeArgIndex + zeroRelativeArgIndex caseOf: { + [0] -> [cogit MoveR: abstractRegister R: CArg0Reg]. + [1] -> [cogit MoveR: abstractRegister R: CArg1Reg]. + [2] -> [cogit MoveR: abstractRegister R: CArg2Reg]. + [3] -> [cogit MoveR: abstractRegister R: CArg3Reg].}. - cogit PushR: abstractRegister. ^0! Item was changed: ----- Method: CogARMCompiler>>genRestoreRegisters (in category 'abi') ----- genRestoreRegisters "Load the general purpose registers after the return of a trampoline call." + "Because no registers were saved we don't restore any." + "cogit + gen: LDMFD operand: 16r7F"! - "Load r0-r6, all of which were saved. Don't load sb(r9), sl(r10), fp(r11), sp or lr" - cogit - gen: LDMFD operand: 16r7F! Item was changed: ----- Method: CogARMCompiler>>genSaveRegisters (in category 'abi') ----- genSaveRegisters "Save the general purpose registers for a trampoline call." + "Save none, because we use only callee saved registers." + "cogit + gen: STMFD operand: 16r7F"! - "Save r0-r6, all of which are used for variables. Don't save sb(r9), sl(r10), fp(r11), sp or lr" - cogit - gen: STMFD operand: 16r7F! Item was changed: ----- Method: CogARMCompilerForTests class>>dataRegistersWithAccessorsDo: (in category 'test support') ----- dataRegistersWithAccessorsDo: aTrinaryBlock "r0 ... sp. We can't use pc or RISCTempReg, because some opcodes may be encoded as multiple instructions and this, we need to be able to step." + #(0 1 2 3 4 5 6 7 8 9 11 12 13 14) withIndexDo: - #(0 1 2 4 5 6 7 8 9 10 11 12 13 14) withIndexDo: [:reg :i| aTrinaryBlock value: reg + value: (#(r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r11 r12 sp lr) at: i) + value: (#(r0: r1: r2: r3: r4: r5: r6: r7: r8: r9: r11: r12: sp: lr:) at: i)]! - value: (#(r0 r1 r2 r4 r5 r6 r7 r8 r9 r10 r11 r12 sp lr) at: i) - value: (#(r0: r1: r2: r4: r5: r6: r7: r8: r9: r10: r11: r12: sp: lr:) at: i)]! Item was changed: ----- Method: CogARMCompilerTests>>testAdd (in category 'tests') ----- testAdd "self new testAdd" "the forms are valid, " "test AddCqR" self concreteCompilerClass registersWithNamesDo: [ :reg :regName | #(0 16rF 16rFF) do: [:n| | inst len | inst := self gen: AddCqR operand: n operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. herIntended := 'adds ', regName, ', ', regName, ', #', n asString. self assert: (plainJane match: herIntended)]]]. "test AddCwR" self concreteCompilerClass registersWithNamesDo: [ :reg :regName | #(16rFFFFFFFF 16r88888888 0) do: [:n| | inst len | inst := self gen: AddCwR operand: n operand: reg. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 0 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. + herIntended := 'mov sl, #', (n bitAnd: 16rFF << 8) asString. - herIntended := 'mov r3, #', (n bitAnd: 16rFF << 8) asString. self assert: (plainJane match: herIntended)]. self processor disassembleInstructionAt: 4 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. + herIntended := 'orr sl, sl, #', (n bitAnd: 16rFF << 16) asString. - herIntended := 'orr r3, r3, #', (n bitAnd: 16rFF << 16) asString. self assert: (plainJane match: herIntended)]. self processor disassembleInstructionAt: 8 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. + herIntended := 'orr sl, sl, #', (n bitAnd: 16rFF << 24) signedIntFromLong asString. - herIntended := 'orr r3, r3, #', (n bitAnd: 16rFF << 24) signedIntFromLong asString. self assert: (plainJane match: herIntended)]. self processor disassembleInstructionAt: 12 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. + herIntended := 'orr sl, sl, #', (n bitAnd: 16rFF) asString. - herIntended := 'orr r3, r3, #', (n bitAnd: 16rFF) asString. self assert: (plainJane match: herIntended)]. self processor disassembleInstructionAt: 16 In: inst machineCode object into: [:str :sz| | plainJane herIntended | plainJane := self strip: str. + herIntended := 'adds ', regName, ', ', regName, ', sl'. - herIntended := 'adds ', regName, ', ', regName, ', r3'. self assert: (plainJane match: herIntended)]]] ! Item was changed: ----- Method: CogARMCompilerTests>>testPrefetchAw (in category 'tests') ----- testPrefetchAw "self new testPrefetchAw" #(16rFF00FF00 16r00000012) do: [:n| | inst len | inst := self gen: PrefetchAw operand: n. len := inst concretizeAt: 0. self processor disassembleInstructionAt: 12 In: inst machineCode object into: [:str :sz| | plainJane herIntended | "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" plainJane := self strip: str. + herIntended := 'pld [sl', ((n bitAnd: 16rFF) = 0 ifTrue: [''] ifFalse: [', #', (n bitAnd: 16rFF) asString]) ,']'. - herIntended := 'pld [r3', ((n bitAnd: 16rFF) = 0 ifTrue: [''] ifFalse: [', #', (n bitAnd: 16rFF) asString]) ,']'. self assert: (plainJane match: herIntended). self assert: len = 16]]. ! Item was changed: ----- Method: CogAbstractInstruction>>abstractRegisterForConcreteRegister: (in category 'private') ----- abstractRegisterForConcreteRegister: reg (self concreteRegister: TempReg) = reg ifTrue: [^TempReg]. (self concreteRegister: ReceiverResultReg) = reg ifTrue: [^ReceiverResultReg]. (self concreteRegister: ClassReg) = reg ifTrue: [^ClassReg]. (self concreteRegister: SendNumArgsReg) = reg ifTrue: [^SendNumArgsReg]. (self concreteRegister: Arg0Reg) = reg ifTrue: [^Arg0Reg]. (self concreteRegister: Arg1Reg) = reg ifTrue: [^Arg1Reg]. (self concreteRegister: FPReg) = reg ifTrue: [^FPReg]. (self concreteRegister: SPReg) = reg ifTrue: [^SPReg]. self error: 'could not find abstract register'. ^0 + "While the below works fine in Smalltalk it of course doesn't work in C ;)" - "While the below works fine in Smalltalk it fo course doesn't work in C ;)" "^reg caseOf: { [self concreteRegister: TempReg] -> [TempReg]. [self concreteRegister: ReceiverResultReg] -> [ReceiverResultReg]. [self concreteRegister: ClassReg] -> [ClassReg]. [self concreteRegister: SendNumArgsReg] -> [SendNumArgsReg]. [self concreteRegister: Arg0Reg] -> [Arg0Reg]. [self concreteRegister: Arg1Reg] -> [Arg1Reg]. [self concreteRegister: FPReg] -> [FPReg]. [self concreteRegister: SPReg] -> [SPReg] }"!

1 0

VM Maker: Cog-lw.55.mcz
by commits＠source.squeak.org 24 Aug '12

24 Aug '12

Lars Wassermann uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-lw.55.mcz ==================== Summary ==================== Name: Cog-lw.55 Author: lw Time: 24 August 2012, 8:10:39.178 pm UUID: 2c9c00af-723a-ee46-9371-6386cc81ff35 Ancestors: Cog-lw.54 - added class comments to both new ProcessorAlien classes and ProcessorSimulationTrap - pushed up decorateDisassembly:for:, for use in both, IA32Alien and ARMAlien. Also added the address as an additional parameter, to enable the ARM decoration to prepend it. - added postCallArgumentsNumArgs:in: with an extensive comment. =============== Diff against Cog-lw.54 =============== Item was removed: - ----- Method: BochsIA32Alien>>decorateDisassembly:for: (in category 'disassembly') ----- - decorateDisassembly: anInstructionString for: aSymbolManager "<Cogit>" - | string i1 i2 v | - string := anInstructionString. - (i1 := string indexOfSubCollection: '%ds:0x') > 0 ifTrue: - [i2 := i1 + 6. - ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1]. - string := string - copyReplaceFrom: i1 + 4 - to: i2 - 1 - with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 4 to: i2 - 1))]. - (i1 := string indexOfSubCollection: '%ss:0x') > 0 ifTrue: - [i2 := i1 + 6. - ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1]. - ((string at: i2) = $( - and: [(string at: i2 + 1) = $%]) ifTrue: - [v := Integer readFrom: (ReadStream on: string from: i1 + 6 to: i2 - 1) base: 16. - string := string - copyReplaceFrom: i1 - to: i2 - 1 - with: ((v bitAnd: (1 bitShift: 31) - 1) - (v bitAnd: (1 bitShift: 31))) printString]]. - (i1 := string indexOfSubCollection: '$0x') > 0 ifTrue: - [i2 := i1 + 3. - ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1]. - string := string - copyReplaceFrom: i1 + 1 - to: i2 - 1 - with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 1 to: i2 - 1))]. - ((i1 := string indexOf: $() > 1 - and: [(string at: i1 + 1) isDigit - and: [i1 < (i2 := string indexOf: $))]]) ifTrue: - [string := string - copyReplaceFrom: i1 + 1 - to: i2 - 1 - with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 1 to: i2 - 1))]. - ^string! Item was changed: Alien variableByteSubclass: #CogProcessorAlien instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'Cog-Processors'! + + !CogProcessorAlien commentStamp: 'lw 8/23/2012 19:15' prior: 0! + I am the superclass for the Simulation CPU instance wrappers. I ensure that methods used in both/all of them need not be copied.! Item was added: + ----- Method: CogProcessorAlien>>decorateDisassembly:for: (in category 'disassembly') ----- + decorateDisassembly: anInstructionString for: aSymbolManager "<Cogit>" + | string i1 i2 v | + string := anInstructionString. + (i1 := string indexOfSubCollection: '%ds:0x') > 0 ifTrue: + [i2 := i1 + 6. + ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1]. + string := string + copyReplaceFrom: i1 + 4 + to: i2 - 1 + with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 4 to: i2 - 1))]. + (i1 := string indexOfSubCollection: '%ss:0x') > 0 ifTrue: + [i2 := i1 + 6. + ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1]. + ((string at: i2) = $( + and: [(string at: i2 + 1) = $%]) ifTrue: + [v := Integer readFrom: (ReadStream on: string from: i1 + 6 to: i2 - 1) base: 16. + string := string + copyReplaceFrom: i1 + to: i2 - 1 + with: ((v bitAnd: (1 bitShift: 31) - 1) - (v bitAnd: (1 bitShift: 31))) printString]]. + (i1 := string indexOfSubCollection: '$0x') > 0 ifTrue: + [i2 := i1 + 3. + ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1]. + string := string + copyReplaceFrom: i1 + 1 + to: i2 - 1 + with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 1 to: i2 - 1))]. + ((i1 := string indexOf: $() > 1 + and: [(string at: i1 + 1) isDigit + and: [i1 < (i2 := string indexOf: $))]]) ifTrue: + [string := string + copyReplaceFrom: i1 + 1 + to: i2 - 1 + with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 1 to: i2 - 1))]. + ^string! Item was added: + ----- Method: CogProcessorAlien>>decorateDisassembly:for:fromAddress: (in category 'disassembly') ----- + decorateDisassembly: anInstructionString for: aSymbolManager "<Cogit>" fromAddress: address + ^self decorateDisassembly: anInstructionString for: aSymbolManager! Item was changed: ----- Method: CogProcessorAlien>>disassembleFrom:to:in:for:labels:on: (in category 'disassembly') ----- disassembleFrom: startAddress to: endAddress in: memory for: aSymbolManager "<Cogit>" labels: labelDictionary on: aStream | address | address := startAddress. [address <= endAddress] whileTrue: [[:size :string| (aSymbolManager labelForPC: address) ifNotNil: [:label| aStream nextPutAll: label; nextPut: $:; cr]. (labelDictionary at: address ifAbsent: []) ifNotNil: [:label| aStream nextPutAll: label; nextPut: $:; cr]. + aStream nextPutAll: (self decorateDisassembly: string for: aSymbolManager fromAddress: address); cr; flush. - aStream nextPutAll: (self decorateDisassembly: string for: aSymbolManager); cr; flush. address := address + size] valueWithArguments: (self primitiveDisassembleAt: address inMemory: memory)]! Item was changed: CogProcessorAlien variableByteSubclass: #GdbARMAlien instanceVariableNames: '' classVariableNames: 'PostBuildStackDelta' poolDictionaries: '' category: 'Cog-Processors'! + + !GdbARMAlien commentStamp: 'lw 8/23/2012 19:17' prior: 0! + I am a wrapper around the ARMulator CPU instance and emulator routines and I give access to disassembling using libopcodes. My C-part must be compiled with -DMODET, because otherwise my offesets are wrong by one field.! Item was removed: - ----- Method: GdbARMAlien>>decorateDisassembly:for: (in category 'disassembly') ----- - decorateDisassembly: anInstructionString for: aSymbolManager "<Cogit>" - | string i1 i2 v | - string := anInstructionString. - (i1 := string indexOfSubCollection: '%ds:0x') > 0 ifTrue: - [i2 := i1 + 6. - ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1]. - string := string - copyReplaceFrom: i1 + 4 - to: i2 - 1 - with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 4 to: i2 - 1))]. - (i1 := string indexOfSubCollection: '%ss:0x') > 0 ifTrue: - [i2 := i1 + 6. - ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1]. - ((string at: i2) = $( - and: [(string at: i2 + 1) = $%]) ifTrue: - [v := Integer readFrom: (ReadStream on: string from: i1 + 6 to: i2 - 1) base: 16. - string := string - copyReplaceFrom: i1 - to: i2 - 1 - with: ((v bitAnd: (1 bitShift: 31) - 1) - (v bitAnd: (1 bitShift: 31))) printString]]. - (i1 := string indexOfSubCollection: '$0x') > 0 ifTrue: - [i2 := i1 + 3. - ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1]. - string := string - copyReplaceFrom: i1 + 1 - to: i2 - 1 - with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 1 to: i2 - 1))]. - ((i1 := string indexOf: $() > 1 - and: [(string at: i1 + 1) isDigit - and: [i1 < (i2 := string indexOf: $))]]) ifTrue: - [string := string - copyReplaceFrom: i1 + 1 - to: i2 - 1 - with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 1 to: i2 - 1))]. - ^string! Item was added: + ----- Method: GdbARMAlien>>decorateDisassembly:for:fromAddress: (in category 'disassembly') ----- + decorateDisassembly: anInstructionString for: aSymbolManager "<Cogit>" fromAddress: address + "Prepend the address to the decoration string." + | addressPrefix | + addressPrefix := ((address storeStringBase: 16 length: 9 padded: true) allButFirst: 3), ' ', String tab. + anInstructionString = 'mov r1, r1' + ifTrue: [^super decorateDisassembly: addressPrefix, 'nop' for: aSymbolManager]. + ^super decorateDisassembly: addressPrefix, anInstructionString for: aSymbolManager! Item was added: + ----- Method: GdbARMAlien>>postCallArgumentsNumArgs:in: (in category 'execution') ----- + postCallArgumentsNumArgs: numArgs "<Integer>" in: memory "<ByteArray|Bitmap>" + "Answer an argument vector of the requested size after a vanilla + ABI call. For ARM the Procedure Calling Specification can be found in IHI0042D_aapcs.pdf. + On ARM this typically means accessing r0 through r3 and fetching additional arguments from the stack, acording to pages 20f. aapcs. + We assume that all arguments are single word arguments, which can not be supplied on co-processor-registers. + For compatibility with Cog/Slang we answer unsigned values." + ^(1 to: numArgs) collect: [:i | + i < 5 + ifTrue: [self perform: (self registerStateNames at: i)] + "ARM uses a full descending stack. Directly after calling a procedure, nothing but the arguments are pushed." + ifFalse: [memory unsignedLongAt: self sp + (i-5)*4 bigEndian: false]].! Item was changed: ----- Method: GdbARMAlien>>primitiveDisassembleAt:inMemory: (in category 'primitives') ----- primitiveDisassembleAt: address inMemory: memoryArray "<Bitmap|ByteArray>" "Answer an Array of the size and the disassembled code string for the instruction at the current instruction pointer in memory." <primitive: 'primitiveDisassembleAtInMemory' module: 'GdbARMPlugin'> + ^self primitiveFailed! - ^self reportPrimitiveFailure! Item was changed: Error subclass: #ProcessorSimulationTrap instanceVariableNames: 'pc nextpc address type registerAccessor' classVariableNames: '' poolDictionaries: '' category: 'Cog-Processors'! + + !ProcessorSimulationTrap commentStamp: 'lw 8/23/2012 19:25' prior: 0! + A ProcessorSimulationTrap is an Error raised by CogProcessorAliens which allow the VMSimulator to fix the problem and resume execution. + I know where the problem occured (pc) and which instruction is next (nextpc), which field of the processor need be read/written and what type of memory access was the source of error. + + I am created in #handleExecutionPrimitiveFailureIn:minimumAddress:readOnlyBelow: and associated methods. + In the IA32 case, the type is managed by the OpcodeExecutionMap, using the first byte of the last instruction as index. + In the ARM case, we need rely on a case statement, since no byte (sequence) is able to directly tell which type I am of.!

1 0

Standard Interpreter VM for OSX?
by Stefan Marr 23 Aug '12

23 Aug '12

Hi all, Hi Esteban, Hi Eliot: Is there somewhere a prebuilt binary of the standard interpreter? I found the CogVM [1,2] and the StackVM [2], but the standard interpreter, built from current sources does not seem to be anywhere available. The old VMs linked on the VM page [3] do unfortunately either not accept headless and a path to an image (the 5.7 series), or tell me that they do not read images of version 6505 (the 4.2 series). In case there are more recent versions of the non-Cog, non-Stack VM prebuilt out there, would be great if someone could give me a pointer. Thanks Stefan [1] http://www.mirandabanda.org/files/Cog/VM/VM.r2585/ [2] https://ci.lille.inria.fr/pharo/view/Cog/ [3] http://squeakvm.org/mac/ -- Stefan Marr Software Languages Lab Vrije Universiteit Brussel Pleinlaan 2 / B-1050 Brussels / Belgium http://soft.vub.ac.be/~smarr Phone: +32 2 629 2974 Fax: +32 2 629 3525

2 2

VM Maker: VMMaker.oscog-eem.206.mcz
by commits＠source.squeak.org 22 Aug '12

22 Aug '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.206.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.206 Author: eem Time: 22 August 2012, 10:46:10.191 am UUID: 01f091ac-8e0a-4e7c-86ff-ba89dd10fafd Ancestors: VMMaker.oscog-lw.205 Rename compileProlog to compileAbort. =============== Diff against VMMaker.oscog-lw.205 =============== Item was added: + ----- Method: Cogit>>compileAbort (in category 'compile abstract instructions') ----- + compileAbort + "The start of a CogMethod has a call to a run-time abort routine that either + handles an in-line cache failure or a stack overflow. The routine selects the + path depending on ReceiverResultReg; if zero it takes the stack overflow + path; if nonzero the in-line cache miss path. Neither of these paths returns. + The abort routine must be called; In the callee the method is located by + adding the relevant offset to the return address of the call." + stackOverflowCall := self MoveCq: 0 R: ReceiverResultReg. + sendMissCall := self Call: (self methodAbortTrampolineFor: methodOrBlockNumArgs)! Item was changed: ----- Method: Cogit>>compileEntireMethod (in category 'compile abstract instructions') ----- compileEntireMethod "Compile the abstract instructions for the entire method, including blocks." | result | + self compileAbort. - self compileProlog. self compileEntry. (result := self compilePrimitive) < 0 ifTrue: [^result]. self compileFrameBuild. blockCount := 0. (result := self compileMethodBody) < 0 ifTrue: [^result]. blockCount = 0 ifTrue: [^0]. (result := self compileBlockBodies) < 0 ifTrue: [^result]. ^self compileBlockDispatch! Item was changed: ----- Method: Cogit>>computeEntryOffsets (in category 'initialization') ----- computeEntryOffsets "Generate the entry code for a method to determine cmEntryOffset and cmNoCheckEntryOffset. We need cmNoCheckEntryOffset up front to be able to generate the map starting from cmNoCheckEntryOffset" "stack allocate the various collections so that they are effectively garbage collected on return." self allocateOpcodes: 20 bytecodes: 0. methodOrBlockNumArgs := 0. + self compileAbort. - self compileProlog. self compileEntry. self computeMaximumSizes. self generateInstructionsAt: methodZoneBase + (self sizeof: CogMethod). cmEntryOffset := entry address - methodZoneBase. cmNoCheckEntryOffset := noCheckEntry address - methodZoneBase. self cppIf: NewspeakVM ifTrue: [cmDynSuperEntryOffset := dynSuperEntry address - methodZoneBase]. missOffset := sendMissCall address + sendMissCall machineCodeSize - methodZoneBase. entryPointMask := BytesPerWord - 1. [self cppIf: NewspeakVM ifTrue: [(cmEntryOffset bitAnd: entryPointMask) = (cmNoCheckEntryOffset bitAnd: entryPointMask) or: [(cmEntryOffset bitAnd: entryPointMask) = (cmDynSuperEntryOffset bitAnd: entryPointMask) or: [(cmNoCheckEntryOffset bitAnd: entryPointMask) = (cmDynSuperEntryOffset bitAnd: entryPointMask)]]] ifFalse: [(cmEntryOffset bitAnd: entryPointMask) = (cmNoCheckEntryOffset bitAnd: entryPointMask)]] whileTrue: [entryPointMask := entryPointMask + entryPointMask + 1]. entryPointMask >= (methodZone roundUpLength: 1) ifTrue: [self error: 'cannot differentiate checked and unchecked entry-points with current cog method alignment']. checkedEntryAlignment := cmEntryOffset bitAnd: entryPointMask. self assert: checkedEntryAlignment ~= (cmNoCheckEntryOffset bitAnd: entryPointMask). self cppIf: NewspeakVM ifTrue: [cmDynSuperEntryOffset := dynSuperEntry address - methodZoneBase. dynSuperEntryAlignment := cmDynSuperEntryOffset bitAnd: entryPointMask. self assert: (cmDynSuperEntryOffset bitAnd: entryPointMask) ~= (cmEntryOffset bitAnd: entryPointMask). self assert: (cmDynSuperEntryOffset bitAnd: entryPointMask) ~= (cmNoCheckEntryOffset bitAnd: entryPointMask)]!

1 0

Re: Standard Interpreter VM for OSX?
by Esteban Lorenzano 22 Aug '12

22 Aug '12

Hi, this is the last one I compiled: http://squeakvm.org/mac/release/Squeak%204.2.5beta1U.zip I'm not compiling anymore interpreter VMs, but this one should be enough :) Esteban On Aug 21, 2012, at 10:44 AM, Stefan Marr <Stefan.Marr(a)vub.ac.be> wrote: > Hi all, > Hi Esteban, > Hi Eliot: > > Is there somewhere a prebuilt binary of the standard interpreter? > > I found the CogVM [1,2] and the StackVM [2], but the standard interpreter, built from current sources does not seem to be anywhere available. > > The old VMs linked on the VM page [3] do unfortunately either not accept headless and a path to an image (the 5.7 series), or tell me that they do not read images of version 6505 (the 4.2 series). > > In case there are more recent versions of the non-Cog, non-Stack VM prebuilt out there, would be great if someone could give me a pointer. > > Thanks > Stefan > > [1] http://www.mirandabanda.org/files/Cog/VM/VM.r2585/ > [2] https://ci.lille.inria.fr/pharo/view/Cog/ > [3] http://squeakvm.org/mac/ > > > > -- > Stefan Marr > Software Languages Lab > Vrije Universiteit Brussel > Pleinlaan 2 / B-1050 Brussels / Belgium > http://soft.vub.ac.be/~smarr > Phone: +32 2 629 2974 > Fax: +32 2 629 3525 >

5 9

[GSoC] Report
by Lars 21 Aug '12

21 Aug '12

Hello Mailinglist, because this week, the GSoC program ends, here is a report on how far we are on the path of JITting on ARM. A major step on that path is successfully simulating an image using the CogVMSimulator. For that, we need emulation of ARM memory chunks on development systems and disassembling to support debugging. Both things are done with Bochs for IA32, and ARMulator/libopcodes for ARM. Creating the GdbARMPlugin and testing it consumed the first half of the GSoC time. On that front, only smaller changes might be necessary. For emulating, there might be a performance leak when simulating, because long jumps don't err when they jump, but only when they arrive, forgetting their origin. This requires the Simulator to be run in single-step mode, saving the last instruction, instead of just running. For changing this, changing the main ARMulator loop might be necessary. And since we are not far enough, that performance is an issue, it is skipped. The disassembler works, but there seem to be different output conventions, e.g. ldmfd can also be translated as pop. Those different styles of disassembly are left to defaults, which might change depending on the build environment. In the last weeks, we filled CogARMCompiler and CogGdbARMAlien. The majority of abstract opcodes (from RTLOpcodes) is now implemented and can be used. Also, the ProcessorSimulationTrap errors are there. This allows the simulated code to request memory values and function values from the simulator. Some ProcessorSimulationTrap cases are not correct (they still have a halt), because they didn't occur, yet. The AbstractCompilerTests are all green and we also added some more. So what remains to be done? While we can generate code and run it on the emulator, disassemble code chunks and even jump back into the simulator, the organisation of code is in parts very specific to IA32, because this was the primary and most important target. For example in IA32, there exists a call opcode, while ARM has only branch and link. The Cogit expects the return address to be pushed, but ARM can not do that, without adding code to the preamble of each procedure. The ARM ABI specifies that the arguments are first saved to registers r0 through r3, before pushing additional arguments on the stack. But when calling back to the image, the translation so far generates code which pushes all the arguments, because this is IA32 ABI. I would assume that there are plenty more of those smaller differences, which are hard coded in Cog, but need to be changed now, in order to enable ARM JITting. And once the Simulator works, there is more glue code necessary. The only one I was confronted with so far is about flushing the ICache, but I expect there will be more. Are there any questions? See you next week in Gent, Lars Wassermann

1 0

[commit] r2587 - Add a manifest file to the windows VMs that causes the V6 controls to be used
by commits＠squeakvm.org 21 Aug '12

21 Aug '12

Author: eliot Date: 2012-08-20 18:25:17 -0700 (Mon, 20 Aug 2012) New Revision: 2587 Added: branches/Cog/cygwinbuild/Croquet.exe.manifest branches/Cog/cygwinbuild/Pharo.exe.manifest branches/Cog/cygwinbuild/Squeak.exe.manifest branches/Cog/nscogbuild/cygwinbuild/nsvm.exe.manifest Modified: branches/Cog/cygwinbuild/Makefile branches/Cog/nscogbuild/cygwinbuild/Makefile branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/Makefile branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk branches/Cog/nscogbuild/cygwinbuild/nsvm.rc branches/Cog/scripts/mkvmarchives Log: Add a manifest file to the windows VMs that causes the V6 controls to be used (nicer buttons etc). Modify the Newspeak installer and VM archive script to include the manifest file. Added: branches/Cog/cygwinbuild/Croquet.exe.manifest =================================================================== --- branches/Cog/cygwinbuild/Croquet.exe.manifest (rev 0) +++ branches/Cog/cygwinbuild/Croquet.exe.manifest 2012-08-21 01:25:17 UTC (rev 2587) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity + version="1.0.0.0" + processorArchitecture="*" + name="www.mirandabanda.org.Cog.Croquet" + type="win32" +/> +<description>Croquet Virtual Machine</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Modified: branches/Cog/cygwinbuild/Makefile =================================================================== --- branches/Cog/cygwinbuild/Makefile 2012-08-15 02:22:30 UTC (rev 2586) +++ branches/Cog/cygwinbuild/Makefile 2012-08-21 01:25:17 UTC (rev 2587) @@ -355,6 +355,7 @@ $(VMRES): $(BASEDIR)/$(VM).rc $(RC) $(RCFLAGS) -i $(BASEDIR)/$(VM).rc -o $(OBJDIR)/$@ + $(CP) $(VM).exe.manifest $(OBJDIR) resource.o: $(VMRES) $(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@ Added: branches/Cog/cygwinbuild/Pharo.exe.manifest =================================================================== --- branches/Cog/cygwinbuild/Pharo.exe.manifest (rev 0) +++ branches/Cog/cygwinbuild/Pharo.exe.manifest 2012-08-21 01:25:17 UTC (rev 2587) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity + version="1.0.0.0" + processorArchitecture="*" + name="www.mirandabanda.org.Cog.Pharo" + type="win32" +/> +<description>Pharo Smalltalk Virtual Machine</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Added: branches/Cog/cygwinbuild/Squeak.exe.manifest =================================================================== --- branches/Cog/cygwinbuild/Squeak.exe.manifest (rev 0) +++ branches/Cog/cygwinbuild/Squeak.exe.manifest 2012-08-21 01:25:17 UTC (rev 2587) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity + version="1.0.0.0" + processorArchitecture="*" + name="www.mirandabanda.org.Cog.Squeak" + type="win32" +/> +<description>Squeak Smalltalk Virtual Machine</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Modified: branches/Cog/nscogbuild/cygwinbuild/Makefile =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/Makefile 2012-08-15 02:22:30 UTC (rev 2586) +++ branches/Cog/nscogbuild/cygwinbuild/Makefile 2012-08-21 01:25:17 UTC (rev 2587) @@ -314,6 +314,7 @@ $(VMRES): $(BASEDIR)/$(VM).rc $(RC) $(RCFLAGS) -i $(BASEDIR)/$(VM).rc -o $(OBJDIR)/$@ + $(CP) $(VM).exe.manifest $(OBJDIR) resource.o: $(VMRES) $(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@ Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in 2012-08-15 02:22:30 UTC (rev 2586) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in 2012-08-21 01:25:17 UTC (rev 2587) @@ -2,5 +2,6 @@ s72 S38 s72 i2 S255 S72 Component Component AdvertisedShortcut {@@FRESH_GUID1@@} BASEAPPDIR 0 @@VM_EXECUTABLE@@ -Support {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MAP@@ -Sources {@@FRESH_GUID3@@} BASEAPPDIR 0 @@SOURCEFILENAME1@@ +Support1 {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MAP@@ +Support2 {@@FRESH_GUID3@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MANIFEST@@ +Sources {@@FRESH_GUID4@@} BASEAPPDIR 0 @@SOURCEFILENAME1@@ Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in 2012-08-15 02:22:30 UTC (rev 2586) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in 2012-08-21 01:25:17 UTC (rev 2587) @@ -2,5 +2,6 @@ s72 S38 s72 i2 S255 S72 Component Component AdvertisedShortcut {@@FRESH_GUID1@@} BASEAPPDIR 0 @@VM_EXECUTABLE@@ -Support {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MAP@@ -Documentation {@@FRESH_GUID3@@} DOCDIR 0 index.html +Support1 {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MAP@@ +Support2 {@@FRESH_GUID3@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MANIFEST@@ +Documentation {@@FRESH_GUID4@@} DOCDIR 0 index.html Modified: branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in 2012-08-15 02:22:30 UTC (rev 2586) +++ branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in 2012-08-21 01:25:17 UTC (rev 2587) @@ -3,4 +3,5 @@ FeatureComponents Feature_ Component_ Typical AdvertisedShortcut Typical Sources -Typical Support +Typical Support1 +Typical Support2 Modified: branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in 2012-08-15 02:22:30 UTC (rev 2586) +++ branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in 2012-08-21 01:25:17 UTC (rev 2587) @@ -2,5 +2,5 @@ s38 s72 FeatureComponents Feature_ Component_ Typical AdvertisedShortcut -Typical Documentation -Typical Support +Typical Support1 +Typical Support2 Modified: branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in 2012-08-15 02:22:30 UTC (rev 2586) +++ branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in 2012-08-21 01:25:17 UTC (rev 2587) @@ -2,5 +2,6 @@ s72 s72 l255 i4 S72 S20 I2 i2 File File @@VM_EXECUTABLE@@ AdvertisedShortcut @@VM_EXECUTABLE@@ 0 16896 1 -@@VM_EXECUTABLE_MAP@@ Support @@VM_EXECUTABLE_MAP@@ 0 16896 1 +@@VM_EXECUTABLE_MAP@@ Support1 @@VM_EXECUTABLE_MAP@@ 0 16896 1 +@@VM_EXECUTABLE_MANIFEST@@ Support2 @@VM_EXECUTABLE_MANIFEST@@ 0 16896 1 @@SOURCEFILENAME1@@ Sources source1.src|@@SOURCEFILENAME1@@ 0 16896 1 Modified: branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in 2012-08-15 02:22:30 UTC (rev 2586) +++ branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in 2012-08-21 01:25:17 UTC (rev 2587) @@ -2,5 +2,6 @@ s72 s72 l255 i4 S72 S20 I2 i2 File File @@VM_EXECUTABLE@@ AdvertisedShortcut @@VM_EXECUTABLE@@ 0 16896 1 -@@VM_EXECUTABLE_MAP@@ Support @@VM_EXECUTABLE_MAP@@ 0 16896 1 +@@VM_EXECUTABLE_MAP@@ Support1 @@VM_EXECUTABLE_MAP@@ 0 16896 1 +@@VM_EXECUTABLE_MANIFEST@@ Support2 @@VM_EXECUTABLE_MANIFEST@@ 0 16896 1 index.html Documentation index.htm|index.html 0 16896 1 Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Makefile =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2012-08-15 02:22:30 UTC (rev 2586) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2012-08-21 01:25:17 UTC (rev 2587) @@ -14,6 +14,7 @@ # Cab contents: VM_EXECUTABLE := $(VM_BASE_NAME).exe VM_EXECUTABLE_MAP := $(VM_BASE_NAME).map +VM_EXECUTABLE_MANIFEST := $(VM_EXECUTABLE).manifest VM_ICON := $(VM_BASE_NAME).ico SOURCEFILENAME1 := SqueakV41.sources @@ -33,6 +34,10 @@ rm -f $@ cp $< $@ +$(VM_EXECUTABLE_MANIFEST): ../build/vm/$(VM_EXECUTABLE_MANIFEST) + rm -f $@ + cp $< $@ + echovars: @echo '$$(VERSION)='$(VERSION) @echo '$$(VM_ICON)='$(VM_ICON) Modified: branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk 2012-08-15 02:22:30 UTC (rev 2586) +++ branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk 2012-08-21 01:25:17 UTC (rev 2587) @@ -1,6 +1,7 @@ SED_RULES := -e 's%@@BRAND_DIR@@%$(SHORT_BRAND_DIR)|$(BRAND_DIR)%g;' SED_RULES += -e 's%@@VM_EXECUTABLE@@%$(VM_EXECUTABLE)%g;' SED_RULES += -e 's%@@VM_EXECUTABLE_MAP@@%$(VM_EXECUTABLE_MAP)%g;' +SED_RULES += -e 's%@@VM_EXECUTABLE_MANIFEST@@%$(VM_EXECUTABLE_MANIFEST)%g;' SED_RULES += -e 's%@@VM_BASE_NAME@@%$(VM_BASE_NAME)%g;' SED_RULES += -e 's%@@PROJECT_REVERSE_DOMAIN@@%$(PROJECT_REVERSE_DOMAIN)%g;' SED_RULES += -e 's%@@VM_ICON@@%$(notdir $(VM_ICON))%g;' Modified: branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in 2012-08-15 02:22:30 UTC (rev 2586) +++ branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in 2012-08-21 01:25:17 UTC (rev 2587) @@ -10,4 +10,5 @@ ; For unknown reasons, it is important that the files come in this exact order @@VM_EXECUTABLE@@ @@VM_EXECUTABLE_MAP@@ +@@VM_EXECUTABLE_MANIFEST@@ %SourcesDir%\@@SOURCEFILENAME1@@ @@SOURCEFILENAME1@@ Modified: branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2012-08-15 02:22:30 UTC (rev 2586) +++ branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2012-08-21 01:25:17 UTC (rev 2587) @@ -62,10 +62,10 @@ IDTS := File.idt $(REGULAR_IDTS) $(SOURCES_IDTS) -$(REGULAR_IDTS) : %.idt : %.idt.in +$(REGULAR_IDTS) : %.idt : %.idt.in Makefile $(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@ -$(SOURCES_IDTS) : %.idt : %-with-sources.idt.in +$(SOURCES_IDTS) : %.idt : %-with-sources.idt.in Makefile $(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@ SED_FILTER_CONTROL := -e 's/1$\t\t[[]DialogBitmap]$/1048577\1/g;' @@ -122,7 +122,7 @@ echo $(foreach docfile,$(strip $(DOCUMENTATION_FILES)), '$(notdir $(docfile))' '$(call dosname,$(notdir $(docfile)))' '$(notdir $(docfile))') | xargs -r -n 3 printf '%s\tDocumentation\t%s|%s\t0\t\t\t16896\t1\n' >> $@.tmp mv $@.tmp $@ -files.cab: files.ddf $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(DOCUMENTATION_FILES) $(SOURCEFILENAME1) +files.cab: files.ddf $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(VM_EXECUTABLE_MANIFEST) $(DOCUMENTATION_FILES) $(SOURCEFILENAME1) makecab /D SourcesDir='$(shell cygpath -wa .)' /f $< @echo @@ -141,4 +141,4 @@ installer: $(MSI_NAME) clean:: - -rm -rf $(IDTS) Icon Binary Binary.idt *.msi "$(BRAND_DIR)" files.ddf files.cab setup.inf nopMain.o Control.idt.orig Control.idt copyright.rtf + -rm -rf $(IDTS) Icon Binary Binary.idt *.msi "$(BRAND_DIR)" files.ddf files.cab setup.inf nopMain.o Control.idt.orig Control.idt copyright.rtf icon.o Added: branches/Cog/nscogbuild/cygwinbuild/nsvm.exe.manifest =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/nsvm.exe.manifest (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/nsvm.exe.manifest 2012-08-21 01:25:17 UTC (rev 2587) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity + version="1.0.0.0" + processorArchitecture="*" + name="www.mirandabanda.org.Cog.Newspeak" + type="win32" +/> +<description>Newspeak Virtual Machine</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Modified: branches/Cog/nscogbuild/cygwinbuild/nsvm.rc =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/nsvm.rc 2012-08-15 02:22:30 UTC (rev 2586) +++ branches/Cog/nscogbuild/cygwinbuild/nsvm.rc 2012-08-21 01:25:17 UTC (rev 2587) @@ -2,4 +2,13 @@ 1 ICON DISCARDABLE "nsvm.ico" 2 ICON DISCARDABLE "nsvm.ico" 3 ICON DISCARDABLE "nsvm.ico" +#ifndef RT_MANIFEST +# define RT_MANIFEST 24 #endif + +#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID +# define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 +#endif + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "nsvm.exe.manifest" +#endif Modified: branches/Cog/scripts/mkvmarchives =================================================================== --- branches/Cog/scripts/mkvmarchives 2012-08-15 02:22:30 UTC (rev 2586) +++ branches/Cog/scripts/mkvmarchives 2012-08-21 01:25:17 UTC (rev 2587) @@ -76,7 +76,7 @@ if [ -n "$CW" ]; then test -d cogwin || mkdir cogwin rm -rf cogwin/* cogwin.zip - ln cygwinbuild/build/vm/{Croquet.exe,Croquet.ini,Croquet.map} cogwin + ln cygwinbuild/build/vm/{Croquet.exe,Croquet.ini,Croquet.map,Croquet.exe.manifest} cogwin ln cygwinbuild/build/vm/{CroquetConsole.exe,CroquetConsole.ini,CroquetConsole.map} cogwin ln cygwinbuild/build/vm/*.dll cogwin zip -vr cogwin.zip cogwin @@ -85,7 +85,7 @@ if [ -n "$CTW" ]; then test -d cogmtwin || mkdir cogmtwin rm -rf cogmtwin/* cogmtwin.zip - ln cygwinbuild/buildmt/vm/{Croquet.exe,Croquet.ini,Croquet.map} cogmtwin + ln cygwinbuild/buildmt/vm/{Croquet.exe,Croquet.ini,Croquet.map,Croquet.exe.manifest} cogmtwin ln cygwinbuild/buildmt/vm/{CroquetConsole.exe,CroquetConsole.ini,CroquetConsole.map} cogmtwin ln cygwinbuild/buildmt/vm/*.dll cogmtwin zip -vr cogmtwin.zip cogmtwin @@ -106,7 +106,7 @@ if [ -n "$NW" ]; then test -d nsvmwin || mkdir nsvmwin rm -rf nsvmwin/* nsvmwin.zip - ln $NSB/cygwinbuild/build/vm/{nsvm.exe,nsvm.map} nsvmwin + ln $NSB/cygwinbuild/build/vm/{nsvm.exe,nsvm.map,nsvm.exe.manifest} nsvmwin ln $NSB/cygwinbuild/build/vm/*.dll nsvmwin zip -vr nsvmwin.zip nsvmwin EXES="$EXES nsvmwin/nsvm.exe"

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2012