Vm-dev July 2011

vm-dev@lists.squeakfoundation.org

31 participants
164 discussions

CameraPlugin for VM
by Torsten Bergmann 30 Jul '11

30 Jul '11

Hi VM developers (CC Squeak and Pharo list), anyone know about the state of integrating the camera plugin from scratch into the Squeak VM sources. Last discussion I know of is at: http://forum.world.st/Camera-plugins-was-Re-Video-Media-in-Squeak-td2020502… Any news on this or any progress? Are there plans to integrate the plugin into Cog as well? Thx Torsten -- NEU: FreePhone - 0ct/min Handyspartarif mit Geld-zurück-Garantie! Jetzt informieren: http://www.gmx.net/de/go/freephone

2 2

[commit] r2476 - CogVm source as per VMMaker.oscog-eem.113. Refuse to JIT closure no-context-
by commits＠squeakvm.org 29 Jul '11

29 Jul '11

Author: eliot Date: 2011-07-29 12:59:34 -0700 (Fri, 29 Jul 2011) New Revision: 2476 Added: branches/Cog/nscogbuild/cygwinbuild/installer/ branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/Directory-with-sources.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/Directory.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/Feature.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/Icon.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/InstallerBackground.bmp branches/Cog/nscogbuild/cygwinbuild/installer/Makefile branches/Cog/nscogbuild/cygwinbuild/installer/Media.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/NewspeakLicence.txt branches/Cog/nscogbuild/cygwinbuild/installer/Property.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/Registry.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/Shortcut.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/Upgrade.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk branches/Cog/nscogbuild/cygwinbuild/installer/branding.gmk branches/Cog/nscogbuild/cygwinbuild/installer/documentation.gmk branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in branches/Cog/nscogbuild/cygwinbuild/installer/index.html branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk branches/Cog/nscogbuild/cygwinbuild/installer/links branches/Cog/nscogbuild/cygwinbuild/installer/nopMain.c branches/Cog/nscogbuild/cygwinbuild/installer/onebuild Modified: branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h Log: CogVm source as per VMMaker.oscog-eem.113. Refuse to JIT closure no-context- switch value until teh relevant offsets have been computed. Add the Newspeak Windows installer by Peter von der Ahe. Builds an msi. Added: branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,6 @@ +Component ComponentId Directory_ Attributes Condition KeyPath +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@@ Added: branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,6 @@ +Component ComponentId Directory_ Attributes Condition KeyPath +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 Added: branches/Cog/nscogbuild/cygwinbuild/installer/Directory-with-sources.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Directory-with-sources.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Directory-with-sources.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,8 @@ +Directory Directory_Parent DefaultDir +s72 S72 l255 +Directory Directory +TARGETDIR SourceDir +ProgramFilesFolder TARGETDIR . +BASEAPPDIR ProgramFilesFolder @@BRAND_DIR@@:. +ProgramMenuFolder BASEAPPDIR . +DOCDIR BASEAPPDIR doc:. Added: branches/Cog/nscogbuild/cygwinbuild/installer/Directory.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Directory.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Directory.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,8 @@ +Directory Directory_Parent DefaultDir +s72 S72 l255 +Directory Directory +TARGETDIR SourceDir +ProgramFilesFolder TARGETDIR . +BASEAPPDIR ProgramFilesFolder @@BRAND_DIR@@:. +ProgramMenuFolder BASEAPPDIR . +DOCDIR BASEAPPDIR doc:. Added: branches/Cog/nscogbuild/cygwinbuild/installer/Feature.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Feature.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Feature.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,4 @@ +Feature Feature_Parent Title Description Display Level Directory_ Attributes +s38 S38 L64 L255 I2 i2 S72 i2 +Feature Feature +Typical Typical Install Typical 1 3 BASEAPPDIR 0 Added: branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,6 @@ +Feature_ Component_ +s38 s72 +FeatureComponents Feature_ Component_ +Typical AdvertisedShortcut +Typical Sources +Typical Support Added: branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,6 @@ +Feature_ Component_ +s38 s72 +FeatureComponents Feature_ Component_ +Typical AdvertisedShortcut +Typical Documentation +Typical Support Added: branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,6 @@ +File Component_ FileName FileSize Version Language Attributes Sequence +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 +@@SOURCEFILENAME1@@ Sources source1.src|@@SOURCEFILENAME1@@ 0 16896 1 Added: branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,6 @@ +File Component_ FileName FileSize Version Language Attributes Sequence +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 +index.html Documentation index.htm|index.html 0 16896 1 Added: branches/Cog/nscogbuild/cygwinbuild/installer/Icon.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Icon.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Icon.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,4 @@ +Name Data +s72 v0 +Icon Name +@@VM_ICON@@.exe @@VM_ICON@@.exe.ibd Added: branches/Cog/nscogbuild/cygwinbuild/installer/InstallerBackground.bmp =================================================================== (Binary files differ) Property changes on: branches/Cog/nscogbuild/cygwinbuild/installer/InstallerBackground.bmp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/Cog/nscogbuild/cygwinbuild/installer/Makefile =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Makefile (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,34 @@ +# Makefile for the Windows installer on cygwin. Produces a Microsoft .MSI file +# given an executable, and possibly an image file. +# +# How to build: +# On unix edit and run ./links to get .exe, .map and sources, then on cygwin +# run make + +SOURCES := yes +DOCUMENTATION_DIR := doc +GUID_UPGRADE_CODE := FB4E770A-413B-4745-913B-D7EE7041AA48 + +include branding.gmk + +# Cab contents: +VM_EXECUTABLE := $(VM_BASE_NAME).exe +VM_EXECUTABLE_MAP := $(VM_BASE_NAME).map +VM_ICON := $(VM_BASE_NAME).ico +SOURCEFILENAME1 := SqueakV41.sources + +CC := /usr/bin/gcc +CP := /usr/bin/cp +SED := /usr/bin/sed +WINDRES := /usr/bin/windres + +icon.o: ../nsvm.rc + $(WINDRES) --include-dir=.. --define _WIN32 -l 0 -i $< -o $@ + +echovars: + @echo '$$(VERSION)='$(VERSION) + @echo '$$(VM_ICON)='$(VM_ICON) + @echo '$$(DOCUMENTATION_DIR)='$(DOCUMENTATION_DIR) + @echo 'cygpath $$(DOCUMENTATION_DIR)='"$(shell cygpath -wa $(DOCUMENTATION_DIR))\\" + +include installer-Windows.gmk Added: branches/Cog/nscogbuild/cygwinbuild/installer/Media.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Media.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Media.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,4 @@ +DiskId LastSequence DiskPrompt Cabinet VolumeLabel Source +i2 i2 L64 S255 S32 S72 +Media DiskId +1 1 #files.cab Added: branches/Cog/nscogbuild/cygwinbuild/installer/NewspeakLicence.txt =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/NewspeakLicence.txt (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/NewspeakLicence.txt 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,5 @@ +Copyright 2008, Cadence Design Systems + +Licensed under the Apache License, Version 2.0 (the ''License''); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. Added: branches/Cog/nscogbuild/cygwinbuild/installer/Property.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Property.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Property.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,51 @@ +Property Value +s72 l0 +Property Property +AppsShutdownOption All +BannerBitmap bannrbmp +ButtonText_Back < &Back +ButtonText_Browse Br&owse +ButtonText_Cancel Cancel +ButtonText_Exit &Exit +ButtonText_Finish &Finish +ButtonText_Ignore &Ignore +ButtonText_Install &Install +ButtonText_Next &Next > +ButtonText_No &No +ButtonText_OK OK +ButtonText_Remove &Remove +ButtonText_Repair &Repair +ButtonText_Reset &Reset +ButtonText_Resume &Resume +ButtonText_Retry &Retry +ButtonText_Return &Return +ButtonText_Yes &Yes +CompleteSetupIcon completi +CustomSetupIcon custicon +DefaultUIFont DlgFont8 +DialogBitmap dlgbmp +DlgTitleFont {&DlgFontBold8} +ErrorDialog ErrorDlg +ExclamationIcon exclamic +IAgree No +INSTALLLEVEL 3 +InfoIcon info +InstallMode Typical +InstallerIcon insticon +Manufacturer @@MANUFACTURER@@ +PIDTemplate 12345<###-%%%%%%%>@@@@@ +PROMPTROLLBACKCOST P +ProductCode {@@FRESH_GUID1@@} +ProductID none +ProductLanguage 1033 +ProductName @@PRODUCT_NAME@@ +ProductVersion @@PRODUCT_VERSION@@ +Progress1 Installing +Progress2 installs +RemoveIcon removico +RepairIcon repairic +SecureCustomProperties {@@GUID_UPGRADE_CODE@@} +Setup Setup +ShowUserRegistrationDlg 0 +UpgradeCode {@@GUID_UPGRADE_CODE@@} +Wizard Setup Wizard Added: branches/Cog/nscogbuild/cygwinbuild/installer/Registry.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Registry.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Registry.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,7 @@ +Registry Root Key Name Value Component_ +s72 i2 l255 L255 L0 s72 +Registry Registry +FileType 0 .image Newspeak.VirtualMachine.1 AdvertisedShortcut +ProgId 0 Newspeak.VirtualMachine.1 Newspeak Image AdvertisedShortcut +CurVer 0 Newspeak.VirtualMachine.1\CurVer Newspeak.VirtualMachine.1 AdvertisedShortcut +OpenCommand 0 Newspeak.VirtualMachine.1\shell\open\command #%"[#@@VM_EXECUTABLE@@]" "%1" AdvertisedShortcut Added: branches/Cog/nscogbuild/cygwinbuild/installer/Shortcut.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Shortcut.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Shortcut.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,4 @@ +Shortcut Directory_ Name Component_ Target Arguments Description Hotkey Icon_ IconIndex ShowCmd WkDir DisplayResourceDLL DisplayResourceId DescriptionResourceDLL DescriptionResourceId +s72 s72 l128 s72 s72 S255 L255 I2 S72 I2 I2 S72 S100 I4 S100 I4 +Shortcut Shortcut +scAdvertisedShortcut ProgramMenuFolder @@VM_EXECUTABLE@@|@@VM_LOCALIZED_NAME@@ AdvertisedShortcut Typical @@VM_ICON@@.exe Added: branches/Cog/nscogbuild/cygwinbuild/installer/Upgrade.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Upgrade.idt.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Upgrade.idt.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,4 @@ +UpgradeCode VersionMin VersionMax Language Attributes Remove ActionProperty +s38 S20 S20 S255 i4 S255 s72 +Upgrade UpgradeCode VersionMin VersionMax Language Attributes +{@@GUID_UPGRADE_CODE@@} 255.255.0 0 {@@GUID_UPGRADE_CODE@@} Added: branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,16 @@ +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_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;' +SED_RULES += -e 's%@@VM_LOCALIZED_NAME@@%$(VM_LOCALIZED_NAME)%g;' +SED_RULES += -e 's%@@GUID_UPGRADE_CODE@@%$(GUID_UPGRADE_CODE)%g;' +SED_RULES += -e 's%@@MANUFACTURER@@%$(MANUFACTURER)%g;' +SED_RULES += -e 's%@@PRODUCT_NAME@@%$(PRODUCT_NAME)%g;' +SED_RULES += -e 's%@@PRODUCT_VERSION@@%$(PRODUCT_VERSION)%g;' +SED_RULES += -e 's%@@IMAGE@@%$(IMAGE)%g;' +SED_RULES += -e 's%@@SOURCEFILENAME1@@%$(SOURCEFILENAME1)%g;' +SED_RULES += -e 's%@@SOURCEFILENAME2@@%$(SOURCEFILENAME2)%g;' +SED_RULES += -e 's%@@INSTALLER_BACKGROUND@@%$(INSTALLER_BACKGROUND)%g;' +SED_RULES += -e 's/^\#.*//;' Added: branches/Cog/nscogbuild/cygwinbuild/installer/branding.gmk =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/branding.gmk (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/branding.gmk 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,62 @@ +# Version should follow the Windows convention (0-255.0-255.0-65535) +# For the prototype, use YY.MM.DDNN (NN should come from the image +# name, e.g., nsboot-20YY-MM-DD.NN.image) +# For Cog would like to use YY.MMDD.SVN where SVN is the Subversion checkin +# id taken from platforms/Cross/vm/sqSCCSVersion.h. But that doesn't fit +# the 0-255 field. So use YY.WW.SVN where WW is the week number. +#VERSION:= 07.11.0101 +SVNREV := $(shell grep '\$Rev: ' ../../../platforms/Cross/vm/sqSCCSVersion.h | sed 's/.*$Rev: $[0-9][0-9]*$.*/\1/' ) +#VERSION:= $(shell date +%g.%m%d.$(SVNREV)) +VERSION := $(shell date +%g.%U.$(SVNREV)) + +# Base name of the executable (.exe is appended on Windows) +ifndef VM_BASE_NAME +VM_BASE_NAME := nsvm +endif + +# Product name as compiled into the executable and installers +ifndef PRODUCT_NAME +PRODUCT_NAME := Newspeak Virtual Machine +endif + +# Base name of the installer (.msi is appended on Windows) +ifndef INSTALLER_BASE_NAME +INSTALLER_BASE_NAME := $(VM_BASE_NAME) +endif + +# Where to install the product (relative to C:/Program Files on +# Windows, /Applications on Mac, and not used on Linux) +ifndef BRAND_DIR +BRAND_DIR := $(PRODUCT_NAME) +endif + +# Used for Desktop/menubar shortcuts +ifndef VM_LOCALIZED_NAME +VM_LOCALIZED_NAME := $(PRODUCT_NAME) +endif + +ifndef MANUFACTURER +MANUFACTURER := Cadence Design Systems, Inc. +endif + +ifndef PROJECT_REVERSE_DOMAIN +PROJECT_REVERSE_DOMAIN := org.newspeakplatform +endif + +ifndef INSTALLER_BACKGROUND +INSTALLER_BACKGROUND := InstallerBackground +endif + +ifndef INSTALLER_ICON +INSTALLER_ICON := VolumeIcon +endif + +# DO NOT use the same GUID for other projects. If you base a +# different project on this file, generate a new GUID using uuidgen +# from Microsoft Windows SDK (no-cost download). For reasons beyond +# comprehension, most tools generate GUIDs in lowercase. However, +# Windows Installer insists that GUIDs must be UPPER CASE, so be sure +# to supply the /c option to uuidgen. +ifndef GUID_UPGRADE_CODE +$(warning GUID_UPGRADE_CODE not provided) +endif Added: branches/Cog/nscogbuild/cygwinbuild/installer/documentation.gmk =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/documentation.gmk (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/documentation.gmk 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,7 @@ +ifdef DOCUMENTATION_DIR +-include $(DOCUMENTATION_DIR)documentation.gmk +endif + +.PHONY: testdocs +testdocs: + @echo $(DOCUMENTATION_INDEX) $(DOCUMENTATION_FILES) | xargs -n 1 Added: branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,13 @@ +.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 +; For unknown reasons, it is important that the files come in this exact order +@@VM_EXECUTABLE@@ +@@VM_EXECUTABLE_MAP@@ +%SourcesDir%\@@SOURCEFILENAME1@@ @@SOURCEFILENAME1@@ Added: branches/Cog/nscogbuild/cygwinbuild/installer/index.html =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/index.html (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/index.html 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,12 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html> + <head> + <title>Newspeak Documentation</title> + </head> + <body> + <div class="documentationIndex"> + <div class="documentationItem"><a class="localFile" href="newspeak-101.pdf">Tutorial</a></div> + </div> + </body> +</html> Added: branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,148 @@ +# Copyright 2008 Cadence Design Systems, Inc. +# +# Licensed under the Apache License, Version 2.0 (the ''License''); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 +# +# This is the result of stakhanovite effort from Peter von der Ahe. Thanks! + +# components such as MsiFiler.exe et al available from +# Windows SDK Components for Windows Installer Developers +# http://msdn.microsoft.com/en-us/library/aa370834(v=vs.85).aspx + +WIN_SDK_VER := v7.0 + +WIN_SDK := /cygdrive/c/Program\ Files/Microsoft\ SDKs/Windows/$(WIN_SDK_VER)/ +MSIVAL2_DIR := /cygdrive/c/Program\ Files/MsiVal2/ + +MSI_NAME := $(INSTALLER_BASE_NAME).msi +.DEFAULT_GOAL := $(MSI_NAME) +all: $(MSI_NAME) + +# See http://msdn.microsoft.com/en-us/library/aa372834(v=VS.85).aspx +MSIDB := $(WIN_SDK)Bin/MsiDb.Exe +UUIDGEN := $(WIN_SDK)Bin/Uuidgen.Exe +MSIFILER := $(WIN_SDK)Bin/MsiFiler.Exe +MSIINFO := $(WIN_SDK)Bin/MsiInfo.Exe +MSIVAL2 := $(MSIVAL2_DIR)msival2.exe +CUB := $(MSIVAL2_DIR)/XPlogo.cub +UISAMPLE_MSI := $(WIN_SDK)Bin/msitools/Templates/MSI/UISample.Msi +PRODUCT_VERSION := $(VERSION) + +dosname = $(shell touch "$(TMP)/$(1)"; basename "$$(cygpath -s -m "$(TMP)/$(1)")") + +SHORT_BRAND_DIR := $(call dosname,$(BRAND_DIR)) + +include branding-sed-rules.gmk +include documentation.gmk +FRESH_GUID = $(shell $(UUIDGEN) /c) +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) + +REGULAR_IDTS := Feature.idt +REGULAR_IDTS += Icon.idt +REGULAR_IDTS += Media.idt +REGULAR_IDTS += Property.idt +REGULAR_IDTS += Registry.idt +REGULAR_IDTS += Shortcut.idt +REGULAR_IDTS += Upgrade.idt + +ifeq ($(strip $(SOURCES)),yes) +SOURCES_IDTS += Directory.idt +SOURCES_IDTS += Component.idt +SOURCES_IDTS += FeatureComponents.idt +File.idt : File-with-sources.idt.in +else +REGULAR_IDTS += Directory.idt +REGULAR_IDTS += Component.idt +REGULAR_IDTS += FeatureComponents.idt +File.idt : File.idt.in +endif + +IDTS := File.idt $(REGULAR_IDTS) $(SOURCES_IDTS) + +$(REGULAR_IDTS) : %.idt : %.idt.in + $(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@ + +$(SOURCES_IDTS) : %.idt : %-with-sources.idt.in + $(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@ + +SED_FILTER_CONTROL := -e 's/1$\t\t[[]DialogBitmap]$/1048577\1/g;' +# 0x00800003 = 8388611. +# 0x00800000 is the User Account Control (UAC) elevation icon (shield +# icon) (a Windows Vista only feature). We are verifying against +# XPlogo, not Vista so we get a warning unless we clear that bit: +SED_FILTER_CONTROL += -e 's/$PushButton\t[0-9]*\t[0-9]*\t[0-9]*\t[0-9]*\t$8388611\t/\13\t/g;' +GREP_FILTER_CONTROL := -E $$'^LicenseAgreementDlg\tAgreementText\tScrollableText.*' + +%.msi: TMP_MSI = $(@:.msi=.tmp.msi) + +%.ibd: % + $(CP) -p $< $@ + +MSPWD := $(shell cygpath -wa .) + +$(MSI_NAME): $(UISAMPLE_MSI) $(IDTS) Icon/$(notdir $(VM_ICON)).exe.ibd files.cab $(INSTALLER_BACKGROUND).bmp copyright.rtf $(MSIVAL2) + @touch $@ + rm -f $@ + $(CP) "$<" $(TMP_MSI) + $(MSIDB) -e -d "$(shell cygpath -wa $(TMP_MSI))" -f "$(MSPWD)" Binary Control + $(CP) -p $(filter %$(INSTALLER_BACKGROUND).bmp,$^) Binary/dlgbmp.ibd + mv Control.idt Control.idt.orig + $(SED) $(SED_FILTER_CONTROL) Control.idt.orig | grep -v $(GREP_FILTER_CONTROL) > Control.idt + printf 'LicenseAgreementDlg\tAgreementText\t' >> Control.idt + printf 'ScrollableText\t20\t60\t330\t120\t7\t\t' >> Control.idt + cat copyright.rtf >> Control.idt + printf '\tButtons\t\n' >> Control.idt + $(MSIDB) -i -d "$(shell cygpath -wa $(TMP_MSI))" $(patsubst %,-a %,$(filter %.cab,$^)) -f "$(shell cygpath -wa .)" $(filter %.idt,$^) Binary.idt Control.idt + $(MSIFILER) -nologo -d $(TMP_MSI) -h + $(MSIFILER) -nologo -d $(TMP_MSI) -h -s "$(MSPWD)\\" +ifdef DOCUMENTATION_DIR + $(MSIFILER) -nologo -d $(TMP_MSI) -h -s "$(shell cygpath -wa $(DOCUMENTATION_DIR))\\" +endif + $(MSIINFO) "$(shell cygpath -wa $(TMP_MSI))" -T "Installation Database" -J "$(PRODUCT_NAME) $(PRODUCT_VERSION)" -A "$(MANUFACTURER)" -K "Installer, MSI, Database" -O "This installer database contains the logic and data required to install $(PRODUCT_NAME)." -P ";1033" -V "{$(FRESH_GUID)}" -G 200 -W 0 -N "GNU Make" -U 0 -nologo + $(MSIVAL2) "$(shell cygpath -wa $(TMP_MSI))" "$(shell cygpath -wa $(CUB))" -f + chmod a+rx $(TMP_MSI) + mv $(TMP_MSI) $@ + +Icon/$(notdir $(VM_ICON)).exe: icon.o nopMain.o + mkdir -p $(dir $@) + gcc -mwindows $^ -o $@ + strip $@ + +files.ddf: files.ddf.in $(DOCUMENTATION_INDEX) $(DOCUMENTATION_FILES) + $(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@.tmp + @echo $(DOCUMENTATION_INDEX) $(DOCUMENTATION_FILES) | xargs -n 1 >> $@.tmp + mv $@.tmp $@ + +File.idt: $(DOCUMENTATION_FILES) +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) $(DOCUMENTATION_FILES) $(SOURCEFILENAME1) $(SOURCEFILENAME2) +# makecab /D SourcesDir='$(shell cygpath -wa $(TOPDIR)/onebuild)' /f $< +# @echo + +files.cab: files.ddf $(VM_EXECUTABLE) $(DOCUMENTATION_FILES) $(SOURCEFILENAME1) + makecab /D SourcesDir='$(shell cygpath -wa .)' /f $< + @echo + +SED_RTF_RULES := -e 's/$$/\\par /g;' +SED_RTF_RULES += -e "s/([cC])/\\\\'a9/g;" + +copyright.rtf: NewspeakLicence.txt + printf '%s' '{\rtf1\ansi\deff0{\fonttbl{\f0\fnil\fcharset0 Courier New;}}' > $@ + printf '%s' '\viewkind4\uc1\pard\lang1033\f0\fs20 ' >> $@ + $(SED) $(SED_RTF_RULES) $< | tr -d \\r\\n >> $@ + printf '}' >>$@ + +$(MSIVAL2): $(WIN_SDK)Bin/MsiVal2.Msi + msiexec /passive /i "$(shell cygpath -wa '$<')" + +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 Added: branches/Cog/nscogbuild/cygwinbuild/installer/links =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/links (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/links 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,12 @@ +#!/bin/sh +if [ "$1" = rm -o "$1" = mk ]; then + rm SqueakV41.sources nsvm.exe nsvm.map +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' +fi Property changes on: branches/Cog/nscogbuild/cygwinbuild/installer/links ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/nscogbuild/cygwinbuild/installer/nopMain.c =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/nopMain.c (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/nopMain.c 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1,9 @@ +#include <windows.h> + +int WINAPI WinMain (HINSTANCE hInstance, + HINSTANCE hPrevInstance, + PSTR szCmdLine, + int iCmdShow) +{ + return 0; +} Added: branches/Cog/nscogbuild/cygwinbuild/installer/onebuild =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/onebuild (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/onebuild 2011-07-29 19:59:34 UTC (rev 2476) @@ -0,0 +1 @@ +link /Users/eliot/Newspeak/closurevm/onebuild/ \ No newline at end of file Property changes on: branches/Cog/nscogbuild/cygwinbuild/installer/onebuild ___________________________________________________________________ Added: svn:special + * Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2011-07-26 23:39:33 UTC (rev 2475) +++ branches/Cog/nscogsrc/vm/cogit.c 2011-07-29 19:59:34 UTC (rev 2476) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 + CCodeGenerator VMMaker.oscog-eem.113 uuid: 14a788ee-4796-42f0-8d5f-13ec19ffe511 from - StackToRegisterMappingCogit VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 + StackToRegisterMappingCogit VMMaker.oscog-eem.113 uuid: 14a788ee-4796-42f0-8d5f-13ec19ffe511 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.113 uuid: 14a788ee-4796-42f0-8d5f-13ec19ffe511 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -183,7 +183,7 @@ #define ECX 1 #define EDI 7 #define EDX 2 -#define EncounteredUnknownBytecode -2 +#define EncounteredUnknownBytecode -3 #define ESI 6 #define ESP 4 #define Fill16 5 @@ -209,7 +209,7 @@ #define IMULRR 105 #define InstanceSpecificationIndex 2 #define InstructionPointerIndex 1 -#define InsufficientCodeSpace -1 +#define InsufficientCodeSpace -2 #define IsAbsPCReference 4 #define IsDisplacementX2N 1 #define IsNSSendCall 2 @@ -257,9 +257,10 @@ #define LongSizeMask 0xFFFFFFFCUL #define MapEnd 0 #define MaxCompiledPrimitiveIndex 222 -#define MaxNegativeErrorCode -2 +#define MaxNegativeErrorCode -3 #define MaxNumArgs 15 #define MaxUnitDisplacement 31 +#define MaxUnreportableError -2 #define MaxX2NDisplacement 992 #define MethodCacheClass 2 #define MethodCacheMask 0xFFC @@ -291,6 +292,7 @@ #define MulRdRd 99 #define NegateR 68 #define Nop 8 +#define NotFullyInitialized -1 #define NumObjRefsInRuntime 2 #define NumSendTrampolines 4 #define NumTrampolines 58 @@ -3058,8 +3060,10 @@ methodObj = aMethodObj; cogMethod = compileCogMethod(aSelectorOop); if ((((((sqInt)cogMethod)) >= MaxNegativeErrorCode) && ((((sqInt)cogMethod)) <= -1))) { - if ((((sqInt)cogMethod)) == InsufficientCodeSpace) { - callForCogCompiledCodeCompaction(); + if ((((sqInt)cogMethod)) >= MaxUnreportableError) { + if ((((sqInt)cogMethod)) == InsufficientCodeSpace) { + callForCogCompiledCodeCompaction(); + } } else { reportError(((sqInt) cogMethod)); @@ -9936,7 +9940,9 @@ genoperandoperand(AddRR, ClassReg, TempReg); primitiveRoutine = functionPointerForCompiledMethodprimitiveIndex(methodObj, primitiveIndex); if (primitiveRoutine == (primitiveClosureValueNoContextSwitch)) { - assert(blockNoContextSwitchOffset != null); + if (blockNoContextSwitchOffset == null) { + return NotFullyInitialized; + } /* begin SubCq:R: */ genoperandoperand(SubCqR, blockNoContextSwitchOffset, TempReg); } Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2011-07-26 23:39:33 UTC (rev 2475) +++ branches/Cog/nscogsrc/vm/cogit.h 2011-07-29 19:59:34 UTC (rev 2476) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 + CCodeGenerator VMMaker.oscog-eem.113 uuid: 14a788ee-4796-42f0-8d5f-13ec19ffe511 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2011-07-26 23:39:33 UTC (rev 2475) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2011-07-29 19:59:34 UTC (rev 2476) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 + CCodeGenerator VMMaker.oscog-eem.113 uuid: 14a788ee-4796-42f0-8d5f-13ec19ffe511 */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jul 26 15:51:31 PDT 2011 + Fri Jul 29 12:58:01 PDT 2011 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2011-07-26 23:39:33 UTC (rev 2475) +++ branches/Cog/src/vm/cogit.c 2011-07-29 19:59:34 UTC (rev 2476) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 + CCodeGenerator * VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 from - StackToRegisterMappingCogit VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 + StackToRegisterMappingCogit * VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit * VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -183,7 +183,7 @@ #define ECX 1 #define EDI 7 #define EDX 2 -#define EncounteredUnknownBytecode -2 +#define EncounteredUnknownBytecode -3 #define ESI 6 #define ESP 4 #define Fill16 5 @@ -209,7 +209,7 @@ #define IMULRR 105 #define InstanceSpecificationIndex 2 #define InstructionPointerIndex 1 -#define InsufficientCodeSpace -1 +#define InsufficientCodeSpace -2 #define IsAbsPCReference 4 #define IsDisplacementX2N 1 #define IsNSSendCall null @@ -257,9 +257,10 @@ #define LongSizeMask 0xFFFFFFFCUL #define MapEnd 0 #define MaxCompiledPrimitiveIndex 222 -#define MaxNegativeErrorCode -2 +#define MaxNegativeErrorCode -3 #define MaxNumArgs 15 #define MaxUnitDisplacement 31 +#define MaxUnreportableError -2 #define MaxX2NDisplacement 992 #define MethodCacheClass 2 #define MethodCacheMask 0xFFC @@ -291,6 +292,7 @@ #define MulRdRd 99 #define NegateR 68 #define Nop 8 +#define NotFullyInitialized -1 #define NumObjRefsInRuntime 2 #define NumSendTrampolines 4 #define NumTrampolines 50 @@ -2981,8 +2983,10 @@ methodObj = aMethodObj; cogMethod = compileCogMethod(aSelectorOop); if ((((((sqInt)cogMethod)) >= MaxNegativeErrorCode) && ((((sqInt)cogMethod)) <= -1))) { - if ((((sqInt)cogMethod)) == InsufficientCodeSpace) { - callForCogCompiledCodeCompaction(); + if ((((sqInt)cogMethod)) >= MaxUnreportableError) { + if ((((sqInt)cogMethod)) == InsufficientCodeSpace) { + callForCogCompiledCodeCompaction(); + } } else { reportError(((sqInt) cogMethod)); @@ -9779,7 +9783,9 @@ genoperandoperand(AddRR, ClassReg, TempReg); primitiveRoutine = functionPointerForCompiledMethodprimitiveIndex(methodObj, primitiveIndex); if (primitiveRoutine == (primitiveClosureValueNoContextSwitch)) { - assert(blockNoContextSwitchOffset != null); + if (blockNoContextSwitchOffset == null) { + return NotFullyInitialized; + } /* begin SubCq:R: */ genoperandoperand(SubCqR, blockNoContextSwitchOffset, TempReg); } Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2011-07-26 23:39:33 UTC (rev 2475) +++ branches/Cog/src/vm/cogit.h 2011-07-29 19:59:34 UTC (rev 2476) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 + CCodeGenerator * VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */

1 0

compiling B3DAcceleratorPlugin on Lion
by Esteban Lorenzano 29 Jul '11

29 Jul '11

Hi, I'm following the problem that prevents B3DAcceleratorPlugin to compile in Lion, SDK 10.7. The problem is that glCreateRendererFlags is using NewGWorld, and an enum useTempMem, an API who is deprecated since 10.4 and is not present anymore in 10.7 (well... maybe it is there, but it is not declared on headers). I added this at sqMacOpenGL.c to test behavior: #ifdef MAC_OS_X_VERSION_10_7 #define useTempMem (1L << 2) //This declaration is taken from old sdk definition. #endif and now it compiles, but of course... I have a lot of "implicit declaration of function..." With this, now I have two questions: 1) how can I test if B3DAcceleratorPlugin is working? 2) as this is obviously a horrible patch... how can we change the plugin to be really updated? (btw... this is why I'm so strong about the migration of legacy code as soon as possible... we can not be sure how much time this apis are going to be present) cheers, Esteban

2 1

VM Maker: VMMaker.oscog-eem.113.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 28 Jul '11

28 Jul '11

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://www.squeaksource.com/VMMaker/VMMaker.oscog-eem.113.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.113 Author: eem Time: 28 July 2011, 10:45:01 am UUID: 14a788ee-4796-42f0-8d5f-13ec19ffe511 Ancestors: VMMaker.oscog-eem.112 Cogit: Refuse to jit noContextSwichValue until the relevant entry offset has been computed.

1 0

VM Maker: VMMaker.oscog-eem.112.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 27 Jul '11

27 Jul '11

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://www.squeaksource.com/VMMaker/VMMaker.oscog-eem.112.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.112 Author: eem Time: 26 July 2011, 3:15:08 am UUID: efadaaf2-156f-49df-95df-ea610c02b6b2 Ancestors: VMMaker.oscog-eem.111 Newspeak Cogit: Add missing incremental GC code for implicit receiver cache. Fix markLiteralsAndUnlinkIfUnmarkedSendOrPushImplicit:pc:method: for empty cache. Cogit: Remove C compiler warnings in addressIsInFixups: & methodFor:. Slang: Fix bug on inlining that would redefine method arguments (see TMethod>inlineFunctionCall:in:) Consequently correct some CoInterpreter methods which were accidentally getting the right signature. Also use TMethod>declarationAt:put: in more places. CogMemoryManager: Add an initial CogObjectHeader class.

1 0

[commit] r2475 - Some convenience scripts for unix builds. Fixed/extended upload scripts.
by commits＠squeakvm.org 27 Jul '11

27 Jul '11

Author: eliot Date: 2011-07-26 16:39:33 -0700 (Tue, 26 Jul 2011) New Revision: 2475 Added: branches/Cog/cygwinbuild/mvm branches/Cog/nscogbuild/cygwinbuild/mvm branches/Cog/nscogbuild/unixbuild/bld/mvm branches/Cog/unixbuild/bld/mvm branches/Cog/unixbuild/mtbld/mvm Modified: branches/Cog/scripts/mkvmarchives branches/Cog/scripts/uploadvms Log: Some convenience scripts for unix builds. Fixed/extended upload scripts. Added: branches/Cog/cygwinbuild/mvm =================================================================== --- branches/Cog/cygwinbuild/mvm (rev 0) +++ branches/Cog/cygwinbuild/mvm 2011-07-26 23:39:33 UTC (rev 2475) @@ -0,0 +1,5 @@ +#!/bin/sh +rm -rf build*/vm/Croquet*.exe +make debug;make assert;make +make THREADING=multi CONFIGURATION=debug;make THREADING=multi CONFIGURATION=assert;make THREADING=multi +ls -rlt build*/vm/Croquet*.exe Property changes on: branches/Cog/cygwinbuild/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/nscogbuild/cygwinbuild/mvm =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/mvm (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/mvm 2011-07-26 23:39:33 UTC (rev 2475) @@ -0,0 +1,5 @@ +#!/bin/sh +rm -rf build*/vm/nsvm*.exe +make debug;make assert;make +ls -rlt build*/vm/nsvm*.exe +echo "don't forget to link in sources!!" Added: branches/Cog/nscogbuild/unixbuild/bld/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/bld/mvm (rev 0) +++ branches/Cog/nscogbuild/unixbuild/bld/mvm 2011-07-26 23:39:33 UTC (rev 2475) @@ -0,0 +1,2 @@ +#!/bin/sh +../../../scripts/nukeversion;make install prefix=~/oscogvm/nsvmlinux Property changes on: branches/Cog/nscogbuild/unixbuild/bld/mvm ___________________________________________________________________ Added: svn:executable + * Modified: branches/Cog/scripts/mkvmarchives =================================================================== --- branches/Cog/scripts/mkvmarchives 2011-07-26 22:55:21 UTC (rev 2474) +++ branches/Cog/scripts/mkvmarchives 2011-07-26 23:39:33 UTC (rev 2475) @@ -62,7 +62,6 @@ rm -rf Cog.app/* Cog.app.tgz (cd macbuild/Fast.app>/dev/null;tar cf - *)|(cd Cog.app;tar xvf -) ex "+g/[ >][0-9][0-9]*\.[0-9][0-9]*\.0/s/0$[< ]$/$REV\1/" +w +q Cog.app/Contents/Info.plist -g/ [ tar czf Cog.app.tgz Cog.app EXES="$EXES Cog.app/Contents/MacOS/Croquet" fi @@ -71,7 +70,6 @@ rm -rf CogMT.app/* CogMT.app.tgz (cd macbuild/FastMT.app>/dev/null;tar cf - *)|(cd CogMT.app;tar xvf -) ex "+g/[ >][0-9][0-9]*\.[0-9][0-9]*\.0/s/0$[< ]$/$REV\1/" +w +q CogMT.app/Contents/Info.plist -g/ [ tar czf CogMT.app.tgz CogMT.app EXES="$EXES CogMT.app/Contents/MacOS/Croquet" fi Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2011-07-26 22:55:21 UTC (rev 2474) +++ branches/Cog/scripts/uploadvms 2011-07-26 23:39:33 UTC (rev 2475) @@ -11,7 +11,7 @@ ARCHIVES= while [ -n "$1" ]; do case $1 in - -c) ARCHIVES="$ARCHIVES $CSARCS $CMARCS" + -c) ARCHIVES="$ARCHIVES $CSARCS $CMARCS";; -cl) ARCHIVES="$ARCHIVES coglinux.tgz";; -cm) ARCHIVES="$ARCHIVES Cog.app.tgz";; -cw) ARCHIVES="$ARCHIVES cogwin.zip";; @@ -21,7 +21,7 @@ -nl) ARCHIVES="$ARCHIVES nsvmlinux.tgz";; -nm) ARCHIVES="$ARCHIVES Newspeak Virtual Machine.app.tgz";; -nw) ARCHIVES="$ARCHIVES nsvmwin.zip";; - -n) ARCHIVES="$ARCHIVES $NSARCS" + -n) ARCHIVES="$ARCHIVES $NSARCS";; -l) ARCHIVES="$ARCHIVES coglinux.tgz nsvmlinux.tgz";; -m) ARCHIVES="$ARCHIVES Cog.app.tgz Newspeak Virtual Machine.app.tgz";; -w) ARCHIVES="$ARCHIVES cogwin.tgz nsvmwin.tgz";; @@ -32,6 +32,17 @@ fi VER="`svnversion | sed 's/^.*://'`" echo $VER -test -f README.$VER || vi README.$VER +if [ ! -f README.$VER ]; then + cat <<END >README.$VER +N.B. For Squeak/Pharo/Croquet please use the archives whose names begin with + Cog or cog. The archives whose names begin with nsvm or Newspeak are + for Newspeak and are missing plugins required by Squeak/Pharo/Croquet. + VMs with "mt" or "MT" in the name are multi-threaded VMs which support + non-blocking FFI calls. + +END + svn log platforms/Cross/vm/sqSCCSVersion.h >>README.$VER + vi README.$VER +fi ssh -x eliotmiranda(a)bugsy.dreamhost.com mkdir mirandabanda.org/files/Cog/VM/VM.r$VER scp README.$VER $ARCHIVES eliotmiranda@bugsy.dreamhost.com:mirandabanda.org/files/Cog/VM/VM.r$VER Added: branches/Cog/unixbuild/bld/mvm =================================================================== --- branches/Cog/unixbuild/bld/mvm (rev 0) +++ branches/Cog/unixbuild/bld/mvm 2011-07-26 23:39:33 UTC (rev 2475) @@ -0,0 +1,2 @@ +#!/bin/sh +../../scripts/nukeversion;make install prefix=~/oscogvm/coglinux Property changes on: branches/Cog/unixbuild/bld/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/unixbuild/mtbld/mvm =================================================================== --- branches/Cog/unixbuild/mtbld/mvm (rev 0) +++ branches/Cog/unixbuild/mtbld/mvm 2011-07-26 23:39:33 UTC (rev 2475) @@ -0,0 +1,2 @@ +#!/bin/sh +../../scripts/nukeversion;make install prefix=~/oscogvm/cogmtlinux Property changes on: branches/Cog/unixbuild/mtbld/mvm ___________________________________________________________________ Added: svn:executable + *

1 0

VM Maker: CMakeVMMaker-IgorStasenko.130.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 27 Jul '11

27 Jul '11

Igor Stasenko uploaded a new version of CMakeVMMaker to project VM Maker: http://www.squeaksource.com/VMMaker/CMakeVMMaker-IgorStasenko.130.mcz ==================== Summary ==================== Name: CMakeVMMaker-IgorStasenko.130 Author: IgorStasenko Time: 26 July 2011, 11:22:21 pm UUID: c3d651fb-8b5f-4a0d-9c30-ae3dc0ec1e4e Ancestors: CMakeVMMaker-IgorStasenko.129 - a little bit of cleanup - added rules for building TestOSAPlugin.. but it fails at sources generation phase.

1 0

[commit] r2474 - CogVM source as per VMMaker.oscog-eem.112.mcz.
by commits＠squeakvm.org 27 Jul '11

27 Jul '11

Author: eliot Date: 2011-07-26 15:55:21 -0700 (Tue, 26 Jul 2011) New Revision: 2474 Removed: branches/Cog/VERSION Modified: branches/Cog/nscogbuild/macbuild/CoreVM.plist 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/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/scripts/uploadvms 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 Log: CogVM source as per VMMaker.oscog-eem.112.mcz. Newspeak: Add missing incremental GC code for implicit receiver cache. Fix markLiteralsAndUnlinkIfUnmarkedSendOrPushImplicit:pc:method: for empty cache. Fix Mac VM to use correct Newspeak document icons for source files et al. Nuke long forgotten VERSION, in favour of platforms/Cross/vm/sqSCCSVersion.h. Deleted: branches/Cog/VERSION =================================================================== --- branches/Cog/VERSION 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/VERSION 2011-07-26 22:55:21 UTC (rev 2474) @@ -1 +0,0 @@ -VMMaker-oscog.16 Modified: branches/Cog/nscogbuild/macbuild/CoreVM.plist =================================================================== --- branches/Cog/nscogbuild/macbuild/CoreVM.plist 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/nscogbuild/macbuild/CoreVM.plist 2011-07-26 22:55:21 UTC (rev 2474) @@ -2,8 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>BuildMachineOSBuild</key> - <string>10J4138</string> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleDocumentTypes</key> @@ -28,6 +26,13 @@ <key>CFBundleTypeExtensions</key> <array> <string>sources</string> + <string>ns0</string> + <string>ns1</string> + <string>ns2</string> + <string>ns3</string> + <string>ns4</string> + <string>ns5</string> + <string>ns6</string> </array> <key>CFBundleTypeIconFile</key> <string>Newspeak Virtual Machine.icns</string> @@ -136,46 +141,10 @@ <string>NSVM</string> <key>CGDisableCoalescedUpdates</key> <true/> - <key>DTCompiler</key> - <string></string> - <key>DTPlatformBuild</key> - <string>10M2518</string> - <key>DTPlatformVersion</key> - <string>PG</string> - <key>DTSDKBuild</key> - <string>9L31a</string> - <key>DTSDKName</key> - <string>macosx10.5</string> - <key>DTXcode</key> - <string>0400</string> - <key>DTXcodeBuild</key> - <string>10M2518</string> <key>LSBackgroundOnly</key> <false/> <key>LSMinimumSystemVersion</key> <string>10.5.0</string> - <key>NSServices</key> - <array> - <dict> - <key>NSMenuItem</key> - <dict> - <key>default</key> - <string>Squeak DoIt</string> - </dict> - <key>NSMessage</key> - <string>doitandreturn</string> - <key>NSPortName</key> - <string>Squeak</string> - <key>NSReturnTypes</key> - <array> - <string>NSStringPboardType</string> - </array> - <key>NSSendTypes</key> - <array> - <string>NSStringPboardType</string> - </array> - </dict> - </array> <key>SqueakBrowserMouseCmdButton1</key> <integer>3</integer> <key>SqueakBrowserMouseCmdButton2</key> Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/nscogsrc/vm/cogit.c 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e + CCodeGenerator VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 from - StackToRegisterMappingCogit VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e + StackToRegisterMappingCogit VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -826,7 +826,7 @@ static AbstractInstruction * gMulRR(sqInt reg1, sqInt reg2); static void manageFromto(sqInt theStartAddress, sqInt theLimitAddress); static sqInt mapEndFor(CogMethod *cogMethod); -static sqInt mapForbcpcperformUntilarg(CogMethod *cogMethod, sqInt startbcpc, sqInt (*functionSymbol)(char *mcpc, sqInt bcpc, void *arg), void *arg); +static sqInt mapForbcpcperformUntilarg(CogBlockMethod *cogMethod, sqInt startbcpc, sqInt (*functionSymbol)(char *mcpc, sqInt bcpc, void *arg), void *arg); static sqInt mapForperformUntilarg(CogMethod *cogMethod, int (*functionSymbol)(sqInt annotation, char *mcpc, sqInt arg), sqInt arg); static sqInt mapObjectReferencesInClosedPIC(CogMethod *cPIC); static void mapObjectReferencesInGeneratedRuntime(void); @@ -843,6 +843,7 @@ static sqInt markLiteralsAndUnlinkIfUnmarkedSendOrPushImplicitpcmethod(sqInt annotation, char *mcpc, sqInt cogMethod); static sqInt markLiteralsAndUnlinkIfUnmarkedSendpcmethod(sqInt annotation, char *mcpc, sqInt cogMethod); void markMethodAndReferents(CogBlockMethod *aCogMethod); +static sqInt markNSYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod); static sqInt markYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod); static void marshallSendArguments(sqInt numArgs); usqInt maxCogMethodAddress(void); @@ -1820,7 +1821,7 @@ static sqInt addressIsInFixups(void *address) { - return address >= &fixups[0] && address < &fixups[numAbstractOpcodes]; + return address >= (void *)&fixups[0] && address < (void *)&fixups[numAbstractOpcodes]; } static sqInt @@ -13228,7 +13229,7 @@ methods. */ static sqInt -mapForbcpcperformUntilarg(CogMethod *cogMethod, sqInt startbcpc, sqInt (*functionSymbol)(char *mcpc, sqInt bcpc, void *arg), void *arg) +mapForbcpcperformUntilarg(CogBlockMethod *cogMethod, sqInt startbcpc, sqInt (*functionSymbol)(char *mcpc, sqInt bcpc, void *arg), void *arg) { sqInt aMethodObj; sqInt annotation; @@ -13604,7 +13605,13 @@ && (isYoung((cogMethod->methodObject)))) { markAndTrace((cogMethod->methodObject)); } - mapForperformUntilarg(cogMethod, markYoungObjectspcmethod, ((sqInt)cogMethod)); + mapForperformUntilarg(cogMethod, +# if NewspeakVM + markNSYoungObjectspcmethod +# else /* NewspeakVM */ + markYoungObjectspcmethod +# endif /* NewspeakVM */ + , ((sqInt)cogMethod)); } } pointer += BytesPerWord; @@ -13778,17 +13785,21 @@ classpc = (((sqInt)mcpc)) + (jumpShortByteSize(backEnd)); mixinpc = ((((sqInt)mcpc)) + (jumpShortByteSize(backEnd))) + BytesPerOop; class = unalignedLongAt(backEnd, classpc); - assert((class == 0) - || (addressCouldBeObj(class))); - if (cacheTagIsMarked(class)) { - if (((mixin = unalignedLongAt(backEnd, mixinpc))) != 0) { - markAndTraceLiteral(mixin); + if (class != 0) { + assert(addressCouldBeObj(class)); + if (cacheTagIsMarked(class)) { + if (((mixin = unalignedLongAt(backEnd, mixinpc))) != 0) { + markAndTraceLiteral(mixin); + } } + else { + unalignedLongAtput(backEnd, classpc, 0); + unalignedLongAtput(backEnd, mixinpc, 0); + codeModified = 1; + } } else { - unalignedLongAtput(backEnd, classpc, 0); - unalignedLongAtput(backEnd, mixinpc, 0); - codeModified = 1; + assert((unalignedLongAt(backEnd, mixinpc)) == 0); } } else { @@ -13990,6 +14001,44 @@ /* Mark and trace young literals. */ static sqInt +markNSYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) +{ + sqInt cacheTag; + sqInt class; + sqInt entryPoint; + sqInt literal; + sqInt mixin; + + if (annotation == IsObjectReference) { + literal = literalBeforeFollowingAddress(backEnd, ((sqInt)mcpc)); + markAndTraceLiteralIfYoung(literal); + } + if ( +# if NewspeakVM + (annotation == IsSendCall) + || (annotation == IsNSSendCall) +# else /* NewspeakVM */ + annotation == IsSendCall +# endif /* NewspeakVM */ + ) { + cacheTag = inlineCacheTagAt(backEnd, ((sqInt)mcpc)); + markAndTraceLiteralIfYoung(cacheTag); + entryPoint = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); + if (entryPoint == ceImplicitReceiverTrampoline) { + if (((class = unalignedLongAt(backEnd, (((sqInt)mcpc)) + (jumpShortByteSize(backEnd))))) != 0) { + markAndTraceLiteralIfYoung(class); + mixin = unalignedLongAt(backEnd, ((((sqInt)mcpc)) + (jumpShortByteSize(backEnd))) + BytesPerOop); + markAndTraceLiteralIfYoung(mixin); + } + } + } + return 0; +} + + +/* Mark and trace young literals. */ + +static sqInt markYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { sqInt cacheTag; @@ -14199,13 +14248,13 @@ cogMethod = ((CogMethod *) baseAddress); while ((cogMethod < (limitZony())) - && (cogMethod <= address)) { + && ((((void *) cogMethod)) <= address)) { nextMethod = methodAfter(cogMethod); if (nextMethod == cogMethod) { return 0; } - if ((address >= cogMethod) - && (address < nextMethod)) { + if ((address >= (((void *) cogMethod))) + && (address < (((void *) nextMethod)))) { return cogMethod; } cogMethod = nextMethod; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/nscogsrc/vm/cogit.h 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e + CCodeGenerator VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e + CCodeGenerator VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/nscogsrc/vm/cointerp.c 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 from - CoInterpreter VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e + CoInterpreter VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -676,7 +676,7 @@ static sqInt methodWithHeaderShouldBeCogged(sqInt methodHeader); sqInt methodwithInitialPCHasErrorCode(sqInt methodObj, sqInt initialPC); static CogBlockMethod * mframeCogMethod(char *theFP); -sqInt mframeHomeMethodExport(void); +CogMethod * mframeHomeMethodExport(void); CogMethod * mframeHomeMethod(char *theFP); static sqInt mframeIsBlockActivation(char *theFP); static sqInt mframeReceiver(char *theFP); @@ -1881,7 +1881,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.111"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.112"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -22126,7 +22126,7 @@ return ((CogBlockMethod *) ((longAt(theFP + FoxMethod)) & MFMethodMask)); } -sqInt +CogMethod * mframeHomeMethodExport(void) { sqInt methodField; @@ -22134,9 +22134,9 @@ /* begin mframeHomeMethod: */ methodField = longAt(GIV(framePointer) + FoxMethod); if ((methodField & MFMethodFlagIsBlockFlag) != 0) { - return ((CogMethod *) (cmHomeMethod(((CogBlockMethod *) (methodField & MFMethodMask))))); + return cmHomeMethod(((CogBlockMethod *) (methodField & MFMethodMask))); } - return ((CogMethod *) (((CogMethod *) (methodField & MFMethodMask)))); + return ((CogMethod *) (methodField & MFMethodMask)); } Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/nscogsrc/vm/cointerp.h 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ @@ -111,7 +111,7 @@ sqInt methodPrimitiveIndex(void); sqInt methodShouldBeCogged(sqInt aMethodObj); sqInt methodwithInitialPCHasErrorCode(sqInt methodObj, sqInt initialPC); -sqInt mframeHomeMethodExport(void); +CogMethod * mframeHomeMethodExport(void); CogMethod * mframeHomeMethod(char *theFP); sqInt mMethodClass(void); usqInt newMethodAddress(void); Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2011-07-26 22:55:21 UTC (rev 2474) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 from - CoInterpreter VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e + CoInterpreter VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -679,7 +679,7 @@ static sqInt methodWithHeaderShouldBeCogged(sqInt methodHeader); sqInt methodwithInitialPCHasErrorCode(sqInt methodObj, sqInt initialPC); static CogBlockMethod * mframeCogMethod(char *theFP); -sqInt mframeHomeMethodExport(void); +CogMethod * mframeHomeMethodExport(void); CogMethod * mframeHomeMethod(char *theFP); static sqInt mframeIsBlockActivation(char *theFP); static sqInt mframeReceiver(char *theFP); @@ -1884,7 +1884,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.111"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.112"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -22130,7 +22130,7 @@ return ((CogBlockMethod *) ((longAt(theFP + FoxMethod)) & MFMethodMask)); } -sqInt +CogMethod * mframeHomeMethodExport(void) { sqInt methodField; @@ -22138,9 +22138,9 @@ /* begin mframeHomeMethod: */ methodField = longAt(GIV(framePointer) + FoxMethod); if ((methodField & MFMethodFlagIsBlockFlag) != 0) { - return ((CogMethod *) (cmHomeMethod(((CogBlockMethod *) (methodField & MFMethodMask))))); + return cmHomeMethod(((CogBlockMethod *) (methodField & MFMethodMask))); } - return ((CogMethod *) (((CogMethod *) (methodField & MFMethodMask)))); + return ((CogMethod *) (methodField & MFMethodMask)); } Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/nscogsrc/vm/interp.h 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.111 uuid: 119eefd3-e409-4891-9741-ae7fa472607e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Jul 25 15:46:51 PDT 2011 + Tue Jul 26 15:51:31 PDT 2011 Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/scripts/uploadvms 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,13 +1,17 @@ #!/bin/sh IFS=" " +CSARCS="Cog.app.tgz coglinux.tgz cogwin.zip" +CMARCS="cogmtlinux.tgz CogMT.app.tgz cogmtwin.zip" +NSARCS="Newspeak Virtual Machine.app.tgz nsvmlinux.tgz nsvmwin.zip" +NMARCS="Newspeak Virtual MachineMT.app.tgz nsvmmtlinux.tgz nsvmmtwin.zip" if [ $# = 0 ]; then -ARCHIVES="Cog.app.tgz coglinux.tgz cogwin.zip Newspeak Virtual Machine.app.tgz nsvmlinux.tgz nsvmwin.zip" +ARCHIVES="$CSARCS $CMARCS $NSARCS" else ARCHIVES= while [ -n "$1" ]; do case $1 in - -c) ARCHIVES="$ARCHIVES coglinux.tgz Cog.app.tgz cogwin.zip cogmtlinux.tgz CogMT.app.tgz cogmtwin.zip";; + -c) ARCHIVES="$ARCHIVES $CSARCS $CMARCS" -cl) ARCHIVES="$ARCHIVES coglinux.tgz";; -cm) ARCHIVES="$ARCHIVES Cog.app.tgz";; -cw) ARCHIVES="$ARCHIVES cogwin.zip";; @@ -17,7 +21,7 @@ -nl) ARCHIVES="$ARCHIVES nsvmlinux.tgz";; -nm) ARCHIVES="$ARCHIVES Newspeak Virtual Machine.app.tgz";; -nw) ARCHIVES="$ARCHIVES nsvmwin.zip";; - -n) ARCHIVES="$ARCHIVES nsvmlinux.tgz Newspeak Virtual Machine.app.tgz nsvmwin.zip";; + -n) ARCHIVES="$ARCHIVES $NSARCS" -l) ARCHIVES="$ARCHIVES coglinux.tgz nsvmlinux.tgz";; -m) ARCHIVES="$ARCHIVES Cog.app.tgz Newspeak Virtual Machine.app.tgz";; -w) ARCHIVES="$ARCHIVES cogwin.tgz nsvmwin.tgz";; Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/src/vm/cogit.c 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.107 uuid: e97a2dd5-e1e7-4281-bb49-cb97be511631 + CCodeGenerator VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 from - StackToRegisterMappingCogit VMMaker.oscog-eem.107 uuid: e97a2dd5-e1e7-4281-bb49-cb97be511631 + StackToRegisterMappingCogit VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.107 uuid: e97a2dd5-e1e7-4281-bb49-cb97be511631 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -290,7 +290,6 @@ #define MoveXwrRR 46 #define MulRdRd 99 #define NegateR 68 -#define NewspeakVM 0 #define Nop 8 #define NumObjRefsInRuntime 2 #define NumSendTrampolines 4 @@ -820,7 +819,7 @@ static AbstractInstruction * gMulRR(sqInt reg1, sqInt reg2); static void manageFromto(sqInt theStartAddress, sqInt theLimitAddress); static sqInt mapEndFor(CogMethod *cogMethod); -static sqInt mapForbcpcperformUntilarg(CogMethod *cogMethod, sqInt startbcpc, sqInt (*functionSymbol)(char *mcpc, sqInt bcpc, void *arg), void *arg); +static sqInt mapForbcpcperformUntilarg(CogBlockMethod *cogMethod, sqInt startbcpc, sqInt (*functionSymbol)(char *mcpc, sqInt bcpc, void *arg), void *arg); static sqInt mapForperformUntilarg(CogMethod *cogMethod, int (*functionSymbol)(sqInt annotation, char *mcpc, sqInt arg), sqInt arg); static sqInt mapObjectReferencesInClosedPIC(CogMethod *cPIC); static void mapObjectReferencesInGeneratedRuntime(void); @@ -1805,7 +1804,7 @@ static sqInt addressIsInFixups(void *address) { - return address >= &fixups[0] && address < &fixups[numAbstractOpcodes]; + return address >= (void *)&fixups[0] && address < (void *)&fixups[numAbstractOpcodes]; } static sqInt @@ -13018,7 +13017,7 @@ methods. */ static sqInt -mapForbcpcperformUntilarg(CogMethod *cogMethod, sqInt startbcpc, sqInt (*functionSymbol)(char *mcpc, sqInt bcpc, void *arg), void *arg) +mapForbcpcperformUntilarg(CogBlockMethod *cogMethod, sqInt startbcpc, sqInt (*functionSymbol)(char *mcpc, sqInt bcpc, void *arg), void *arg) { sqInt aMethodObj; sqInt annotation; @@ -13394,7 +13393,13 @@ && (isYoung((cogMethod->methodObject)))) { markAndTrace((cogMethod->methodObject)); } - mapForperformUntilarg(cogMethod, markYoungObjectspcmethod, ((sqInt)cogMethod)); + mapForperformUntilarg(cogMethod, +# if NewspeakVM + markNSYoungObjectspcmethod +# else /* NewspeakVM */ + markYoungObjectspcmethod +# endif /* NewspeakVM */ + , ((sqInt)cogMethod)); } } pointer += BytesPerWord; @@ -13858,13 +13863,13 @@ cogMethod = ((CogMethod *) baseAddress); while ((cogMethod < (limitZony())) - && (cogMethod <= address)) { + && ((((void *) cogMethod)) <= address)) { nextMethod = methodAfter(cogMethod); if (nextMethod == cogMethod) { return 0; } - if ((address >= cogMethod) - && (address < nextMethod)) { + if ((address >= (((void *) cogMethod))) + && (address < (((void *) nextMethod)))) { return cogMethod; } cogMethod = nextMethod; Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/src/vm/cogit.h 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.107 uuid: e97a2dd5-e1e7-4281-bb49-cb97be511631 + CCodeGenerator VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/src/vm/cogmethod.h 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.107 uuid: e97a2dd5-e1e7-4281-bb49-cb97be511631 + CCodeGenerator VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ typedef struct { Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/src/vm/cointerp.c 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 from - CoInterpreter VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb + CoInterpreter VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -203,7 +203,6 @@ #define HeaderTypeShort 3 #define HeaderTypeSizeAndClass 0 #define IFrameSlots 7 -#define IMMUTABILITY 0 #define ImmutabilityBit 0x20000000 #define InstanceSpecificationIndex 2 #define InstructionPointerIndex 1 @@ -241,7 +240,6 @@ #define MillisecondClockMask 0x1FFFFFFF #define MinBackwardJumpCountForCompile 10 #define MyListIndex 3 -#define NewspeakVM 0 #define NextLinkIndex 0 #define NilObject 0 #define PrimCallCollectsProfileSamples 8 @@ -1874,7 +1872,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.106]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.112]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/src/vm/cointerp.h 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ @@ -111,7 +111,7 @@ sqInt methodPrimitiveIndex(void); sqInt methodShouldBeCogged(sqInt aMethodObj); sqInt methodwithInitialPCHasErrorCode(sqInt methodObj, sqInt initialPC); -sqInt mframeHomeMethodExport(void); +CogMethod * mframeHomeMethodExport(void); CogMethod * mframeHomeMethod(char *theFP); sqInt mMethodClass(void); usqInt newMethodAddress(void); Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/src/vm/cointerpmt.c 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 from - CoInterpreterMT VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb + CoInterpreterMT VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -233,7 +233,6 @@ #define HeaderTypeShort 3 #define HeaderTypeSizeAndClass 0 #define IFrameSlots 7 -#define IMMUTABILITY 0 #define ImmutabilityBit 0x20000000 #define InstanceSpecificationIndex 2 #define InstructionPointerIndex 1 @@ -272,7 +271,6 @@ #define MillisecondClockMask 0x1FFFFFFF #define MinBackwardJumpCountForCompile 10 #define MyListIndex 3 -#define NewspeakVM 0 #define NextLinkIndex 0 #define NilObject 0 #define OwnVMForeignThreadFlag 0x20000 @@ -1974,7 +1972,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.106]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.112]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/src/vm/cointerpmt.h 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ @@ -113,7 +113,7 @@ sqInt methodPrimitiveIndex(void); sqInt methodShouldBeCogged(sqInt aMethodObj); sqInt methodwithInitialPCHasErrorCode(sqInt methodObj, sqInt initialPC); -sqInt mframeHomeMethodExport(void); +CogMethod * mframeHomeMethodExport(void); CogMethod * mframeHomeMethod(char *theFP); sqInt mMethodClass(void); usqInt newMethodAddress(void); Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2011-07-26 22:55:21 UTC (rev 2474) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 from - CoInterpreter VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb + CoInterpreter VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -206,7 +206,6 @@ #define HeaderTypeShort 3 #define HeaderTypeSizeAndClass 0 #define IFrameSlots 7 -#define IMMUTABILITY 0 #define ImmutabilityBit 0x20000000 #define InstanceSpecificationIndex 2 #define InstructionPointerIndex 1 @@ -244,7 +243,6 @@ #define MillisecondClockMask 0x1FFFFFFF #define MinBackwardJumpCountForCompile 10 #define MyListIndex 3 -#define NewspeakVM 0 #define NextLinkIndex 0 #define NilObject 0 #define PrimCallCollectsProfileSamples 8 @@ -1877,7 +1875,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.106]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.112]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2011-07-26 22:55:21 UTC (rev 2474) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 from - CoInterpreterMT VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb + CoInterpreterMT VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -236,7 +236,6 @@ #define HeaderTypeShort 3 #define HeaderTypeSizeAndClass 0 #define IFrameSlots 7 -#define IMMUTABILITY 0 #define ImmutabilityBit 0x20000000 #define InstanceSpecificationIndex 2 #define InstructionPointerIndex 1 @@ -275,7 +274,6 @@ #define MillisecondClockMask 0x1FFFFFFF #define MinBackwardJumpCountForCompile 10 #define MyListIndex 3 -#define NewspeakVM 0 #define NextLinkIndex 0 #define NilObject 0 #define OwnVMForeignThreadFlag 0x20000 @@ -1977,7 +1975,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.106]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.112]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/src/vm/interp.h 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2011-07-25 22:47:11 UTC (rev 2473) +++ branches/Cog/src/vm/vmCallback.h 2011-07-26 22:55:21 UTC (rev 2474) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.106 uuid: 5e185229-3c2a-4912-a60f-e2a42fa627cb + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.112 uuid: efadaaf2-156f-49df-95df-ea610c02b6b2 */ #define VM_CALLBACK_INC 1

1 0

VM Maker: CMakeVMMaker-IgorStasenko.129.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 27 Jul '11

27 Jul '11

Igor Stasenko uploaded a new version of CMakeVMMaker to project VM Maker: http://www.squeaksource.com/VMMaker/CMakeVMMaker-IgorStasenko.129.mcz ==================== Summary ==================== Name: CMakeVMMaker-IgorStasenko.129 Author: IgorStasenko Time: 26 July 2011, 10:55:03 pm UUID: c78cffca-f974-4c37-8e5d-676871d90d0a Ancestors: CMakeVMMaker-EstebanLorenzano.128 - added QuicktimePlugin for Mac Carbon configs

1 0

[commit] r2463 - CogVM source as per VMMaker.oscog-eem.105. Fix signed32BitValueOf for most neg-
by David T. Lewis 26 Jul '11

26 Jul '11

Commit message blocked due to size, forwarding trimmed version: Author: eliot Date: 2011-07-18 17:35:51 -0700 (Mon, 18 Jul 2011) New Revision: 2463 Added: branches/Cog/macbuild/CoreMTVM.xcodeproj/ branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerpmt.c Modified: branches/Cog/macbuild/makevm branches/Cog/macbuild/mvm branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 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/platforms/win32/vm/sqWin32Window.c branches/Cog/scripts/findUnofficialFiles branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/gcc3x-cointerp.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 Log: CogVM source as per VMMaker.oscog-eem.105. Fix signed32BitValueOf for most neg- ative value C compiler mis-optimization. Speed up primitiveFail using ! trick. Add multi-threaded sources to tree (won't build yet due to issue in ia32abicc.c) Upgrade nscogsrc/plugins to official versions. Added: branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj (rev 0) +++ branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj 2011-07-19 <snip>

5 12

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2011