[Vm-dev] [commit][2669] CogVM source as per /VMMaker.oscog-eem.253.
commits at squeakvm.org
commits at squeakvm.org
Thu Jan 10 23:34:46 UTC 2013
Revision: 2669
Author: eliot
Date: 2013-01-10 15:34:44 -0800 (Thu, 10 Jan 2013)
Log Message:
-----------
CogVM source as per /VMMaker.oscog-eem.253.
Implement absent receiver dynamic super send in the Cogit.
Change the Teleplace licenses to 3D ICC.
Modified Paths:
--------------
branches/Cog/LICENSE
branches/Cog/README
branches/Cog/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
branches/Cog/nscogsrc/vm/cogit.c
branches/Cog/nscogsrc/vm/cogit.h
branches/Cog/nscogsrc/vm/cogmethod.h
branches/Cog/platforms/Cross/vm/sqExternalSemaphores.c
branches/Cog/platforms/Cross/vm/sqMemoryFence.h
branches/Cog/platforms/Cross/vm/sqTicker.c
branches/Cog/platforms/Mac OS/vm/nsPoolManagement.h
branches/Cog/platforms/Mac OS/vm/nsPoolManagement.m
branches/Cog/stackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
Removed Paths:
-------------
branches/Cog/macbuild/install.sh
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/LICENSE
===================================================================
--- branches/Cog/LICENSE 2013-01-10 00:47:22 UTC (rev 2668)
+++ branches/Cog/LICENSE 2013-01-10 23:34:44 UTC (rev 2669)
@@ -1,5 +1,6 @@
-All contributions from Teleplace in this release are
-Copyright (c) 2010 Teleplace, Inc.
+License (MIT):
+All contributions from 3D Immersive Collaboration Consulting in this release are
+Copyright (c) 2013 3D Immersive Collaboration Consulting, LLC.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Modified: branches/Cog/README
===================================================================
--- branches/Cog/README 2013-01-10 00:47:22 UTC (rev 2668)
+++ branches/Cog/README 2013-01-10 23:34:44 UTC (rev 2669)
@@ -225,7 +225,7 @@
know.
License (MIT):
-Copyright (c) 2010 Teleplace, Inc.
+Copyright (c) 2013 3D Immersive Collaboration Consulting, LLC.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Modified: branches/Cog/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj 2013-01-10 00:47:22 UTC (rev 2668)
+++ branches/Cog/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj 2013-01-10 23:34:44 UTC (rev 2669)
@@ -259,9 +259,6 @@
/* Begin PBXProject section */
66DF6BFD01D7DCEA00A80119 /* Project object */ = {
isa = PBXProject;
- attributes = {
- ORGANIZATIONNAME = "Teleplace, Inc.";
- };
buildConfigurationList = 946BCE000959347500803517 /* Build configuration list for PBXProject "Mpeg3Plugin" */;
compatibilityVersion = "Xcode 3.0";
developmentRegion = English;
Deleted: branches/Cog/macbuild/install.sh
===================================================================
--- branches/Cog/macbuild/install.sh 2013-01-10 00:47:22 UTC (rev 2668)
+++ branches/Cog/macbuild/install.sh 2013-01-10 23:34:44 UTC (rev 2669)
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# This puts a fresh-built vm into /Applications without removing what was already there,
-# by overwriting only the parts you've just built.
-
-# Copy to /Applications, excluding any .svn subdirs.
-
-tar cf - --exclude .svn --exclude 'Squeak*icns' ./Teleplace.app | (cd /Applications; tar xf -)
-
-# All the sub-content frameworks and the exe need to be executable;
-# we just do everything so we don't miss anything.
-
-cd /Applications/Teleplace.app
-chmod -R a+x ./*
-
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2013-01-10 00:47:22 UTC (rev 2668)
+++ branches/Cog/nscogsrc/vm/cogit.c 2013-01-10 23:34:44 UTC (rev 2669)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81
+ CCodeGenerator VMMaker.oscog-eem.253 uuid: 4a3ac3fb-d367-478b-ad95-ad3bb8b6216f
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81
+ StackToRegisterMappingCogit VMMaker.oscog-eem.253 uuid: 4a3ac3fb-d367-478b-ad95-ad3bb8b6216f
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.253 uuid: 4a3ac3fb-d367-478b-ad95-ad3bb8b6216f " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -752,8 +752,10 @@
static sqInt genSaveRegisters(AbstractInstruction * self_in_genSaveRegisters);
static sqInt genSaveStackPointers(void);
static sqInt genSecondExtendedSendBytecode(void);
+static sqInt genSendAbsentDynamicSupernumArgs(sqInt selector, sqInt numArgs);
static sqInt genSendAbsentImplicit0ArgsBytecode(void);
static sqInt genSendAbsentImplicitnumArgs(sqInt selector, sqInt numArgs);
+static sqInt genSendDynamicSupernumArgs(sqInt selector, sqInt numArgs);
static sqInt genSendLiteralSelector0ArgsBytecode(void);
static sqInt genSendLiteralSelector1ArgBytecode(void);
static sqInt genSendLiteralSelector2ArgsBytecode(void);
@@ -8570,13 +8572,7 @@
static sqInt
genDynamicSuperSendBytecode(void)
{
- sqInt numArgs;
- sqInt selector;
-
- numArgs = byte1;
- selector = literalofMethod(byte2, methodObj);
- marshallSendArguments(numArgs);
- return genMarshalledSendDynamicSupernumArgs(selector, numArgs);
+ return genSendDynamicSupernumArgs(literalofMethod(byte2, methodObj), byte1);
}
@@ -8984,8 +8980,14 @@
static sqInt
genExtSendAbsentDynamicSuperBytecode(void)
{
- error("shouldBeImplemented");
- return EncounteredUnknownBytecode;
+ sqInt litIndex;
+ sqInt nArgs;
+
+ litIndex = (((usqInt) byte1) >> 3) + (extA << 5);
+ extA = 0;
+ nArgs = (byte1 & 7) + (extB << 3);
+ extB = 0;
+ return genSendAbsentDynamicSupernumArgs(literalofMethod(litIndex, methodObj), nArgs);
}
@@ -12426,6 +12428,26 @@
}
+/* OK, we could do better and avoid spilling ReceiverResultReg if we
+ refactored marshallImplicitReceiverSendArguments: to take a flag saying
+ whether the
+ receiver was in ReceiverResultReg (absent receiver send) or on the stack
+ (absent dynamic super send) and in the latter case loading
+ ReceiverResultReg from the stack after marshalling. But this is a rare
+ bytecode so for the moment
+ don't bother. */
+
+static sqInt
+genSendAbsentDynamicSupernumArgs(sqInt selector, sqInt numArgs)
+{
+ ssAllocateCallReg(ReceiverResultReg);
+ /* begin MoveMw:r:R: */
+ genoperandoperandoperand(MoveMwrR, FoxMFReceiver, FPReg, ReceiverResultReg);
+ marshallImplicitReceiverSendArguments(numArgs);
+ return genMarshalledSendDynamicSupernumArgs(selector, numArgs);
+}
+
+
/* 160-175 1010 i i i i Send To Absent Implicit Receiver Literal Selector
#iiii With 0 Arguments.
*/
@@ -12454,6 +12476,13 @@
}
static sqInt
+genSendDynamicSupernumArgs(sqInt selector, sqInt numArgs)
+{
+ marshallSendArguments(numArgs);
+ return genMarshalledSendDynamicSupernumArgs(selector, numArgs);
+}
+
+static sqInt
genSendLiteralSelector0ArgsBytecode(void)
{
return genSendnumArgs(literalofMethod(byte0 & 15, methodObj), 0);
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2013-01-10 00:47:22 UTC (rev 2668)
+++ branches/Cog/nscogsrc/vm/cogit.h 2013-01-10 23:34:44 UTC (rev 2669)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81
+ CCodeGenerator VMMaker.oscog-eem.253 uuid: 4a3ac3fb-d367-478b-ad95-ad3bb8b6216f
*/
Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h 2013-01-10 00:47:22 UTC (rev 2668)
+++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-01-10 23:34:44 UTC (rev 2669)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81
+ CCodeGenerator VMMaker.oscog-eem.253 uuid: 4a3ac3fb-d367-478b-ad95-ad3bb8b6216f
*/
typedef struct {
Modified: branches/Cog/platforms/Cross/vm/sqExternalSemaphores.c
===================================================================
--- branches/Cog/platforms/Cross/vm/sqExternalSemaphores.c 2013-01-10 00:47:22 UTC (rev 2668)
+++ branches/Cog/platforms/Cross/vm/sqExternalSemaphores.c 2013-01-10 23:34:44 UTC (rev 2669)
@@ -3,7 +3,7 @@
*
* Authors: Eliot Miranda & Brad Fowlow
*
- * Copyright (C) 2009 by Teleplace, Inc.
+ * Copyright (c) 2013 3D Immersive Collaboration Consulting, LLC.
*
* All rights reserved.
*
Modified: branches/Cog/platforms/Cross/vm/sqMemoryFence.h
===================================================================
--- branches/Cog/platforms/Cross/vm/sqMemoryFence.h 2013-01-10 00:47:22 UTC (rev 2668)
+++ branches/Cog/platforms/Cross/vm/sqMemoryFence.h 2013-01-10 23:34:44 UTC (rev 2669)
@@ -3,7 +3,7 @@
*
* Author: Eliot Miranda
*
- * Copyright (C) 2010 by Teleplace, Inc.
+ * Copyright (c) 2013 3D Immersive Collaboration Consulting, LLC.
*
* All rights reserved.
*
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Tue Jan 8 18:13:58 PST 2013
+ Thu Jan 10 15:32:24 PST 2013
Modified: branches/Cog/platforms/Cross/vm/sqTicker.c
===================================================================
--- branches/Cog/platforms/Cross/vm/sqTicker.c 2013-01-10 00:47:22 UTC (rev 2668)
+++ branches/Cog/platforms/Cross/vm/sqTicker.c 2013-01-10 23:34:44 UTC (rev 2669)
@@ -3,7 +3,7 @@
*
* Authors: Eliot Miranda & Josh Gargus
*
- * Copyright (C) 2010 by Teleplace, Inc.
+ * Copyright (c) 2013 3D Immersive Collaboration Consulting, LLC.
*
* All rights reserved.
*
Modified: branches/Cog/platforms/Mac OS/vm/nsPoolManagement.h
===================================================================
--- branches/Cog/platforms/Mac OS/vm/nsPoolManagement.h 2013-01-10 00:47:22 UTC (rev 2668)
+++ branches/Cog/platforms/Mac OS/vm/nsPoolManagement.h 2013-01-10 23:34:44 UTC (rev 2669)
@@ -3,7 +3,7 @@
// CoreVM
//
// Created by Brad Fowlow on 10/15/09.
-// Copyright 2009 Teleplace, Inc. All rights reserved.
+// Copyright (c) 2013 3D Immersive Collaboration Consulting, LLC.
// Main autorelese-pool drain/reset.
// To be called regularly,
Modified: branches/Cog/platforms/Mac OS/vm/nsPoolManagement.m
===================================================================
--- branches/Cog/platforms/Mac OS/vm/nsPoolManagement.m 2013-01-10 00:47:22 UTC (rev 2668)
+++ branches/Cog/platforms/Mac OS/vm/nsPoolManagement.m 2013-01-10 23:34:44 UTC (rev 2669)
@@ -3,7 +3,7 @@
// CoreVM
//
// Created by Brad Fowlow on 10/15/09.
-// Copyright 2009 Teleplace, Inc. All rights reserved.
+// Copyright (c) 2013 3D Immersive Collaboration Consulting, LLC.
#import "interp.h"
#import "sqMemoryAccess.h" /* for sqInt ?!?!? */
Modified: branches/Cog/stackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/stackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj 2013-01-10 00:47:22 UTC (rev 2668)
+++ branches/Cog/stackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj 2013-01-10 23:34:44 UTC (rev 2669)
@@ -259,9 +259,6 @@
/* Begin PBXProject section */
66DF6BFD01D7DCEA00A80119 /* Project object */ = {
isa = PBXProject;
- attributes = {
- ORGANIZATIONNAME = "Teleplace, Inc.";
- };
buildConfigurationList = 946BCE000959347500803517 /* Build configuration list for PBXProject "Mpeg3Plugin" */;
compatibilityVersion = "Xcode 3.0";
developmentRegion = English;
More information about the Vm-dev
mailing list