[Vm-dev] [commit] r2476 - CogVm source as per VMMaker.oscog-eem.113. Refuse to JIT closure no-context-

commits at squeakvm.org commits at squeakvm.org
Fri Jul 29 19:59:34 UTC 2011


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
  */
 
 



More information about the Vm-dev mailing list