[commit] r2156 - Mac Carbon 4.2.3b1U VMMaker 160. MicroSecond clock, compiler warning fixes

 
Author: johnmci
Date: 2010-03-13 23:32:25 -0800 (Sat, 13 Mar 2010)
New Revision: 2156

Modified:
   trunk/platforms/Mac OS/vm/Developer/Squeak VM Universal-Info.plist
   trunk/platforms/Mac OS/vm/Developer/SqueakVMUNIXPATHS.xcodeproj.zip
   trunk/platforms/Mac OS/vm/Documentation/4.x.x Release Notes.rtf
   trunk/platforms/Mac OS/vm/NSCursorWrappers.m
   trunk/platforms/Mac OS/vm/sqMacMain.c
   trunk/platforms/Mac OS/vm/sqMacTime.c
   trunk/platforms/Mac OS/vm/sqMacWindowUniversal.c
Log:
Mac Carbon 4.2.3b1U VMMaker 160. MicroSecond clock, compiler warning fixes

Modified: trunk/platforms/Mac OS/vm/Developer/Squeak VM Universal-Info.plist
===================================================================
--- trunk/platforms/Mac OS/vm/Developer/Squeak VM Universal-Info.plist 2010-03-11 19:11:11 UTC (rev 2155)
+++ trunk/platforms/Mac OS/vm/Developer/Squeak VM Universal-Info.plist 2010-03-14 07:32:25 UTC (rev 2156)
@@ -451,14 +451,14 @@
  <string>pr</string>
  </array>
  <key>public.mime-type</key>
- <string>application/squeak-project</string>
+ <string>application/x-squeak-project</string>
  </dict>
  </dict>
  </array>
  <key>CFBundleExecutable</key>
  <string>Squeak VM Opt</string>
  <key>CFBundleGetInfoString</key>
- <string>Squeak VM 4.2.2b1 http://www.squeak.org</string>
+ <string>Squeak VM 4.2.3b1 http://www.squeak.org</string>
  <key>CFBundleIconFile</key>
  <string>Squeak.icns</string>
  <key>CFBundleIdentifier</key>
@@ -470,11 +470,11 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
- <string>Squeak VM 4.2.2b1</string>
+ <string>Squeak VM 4.2.3b1</string>
  <key>CFBundleSignature</key>
  <string>FAST</string>
  <key>CFBundleVersion</key>
- <string>4.2.2b1</string>
+ <string>4.2.3b1</string>
  <key>CGDisableCoalescedUpdates</key>
  <true/>
  <key>LSBackgroundOnly</key>

Modified: trunk/platforms/Mac OS/vm/Developer/SqueakVMUNIXPATHS.xcodeproj.zip
===================================================================
(Binary files differ)

Modified: trunk/platforms/Mac OS/vm/Documentation/4.x.x Release Notes.rtf
===================================================================
--- trunk/platforms/Mac OS/vm/Documentation/4.x.x Release Notes.rtf 2010-03-11 19:11:11 UTC (rev 2155)
+++ trunk/platforms/Mac OS/vm/Documentation/4.x.x Release Notes.rtf 2010-03-14 07:32:25 UTC (rev 2156)
@@ -1,10 +1,10 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf110
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf250
 {\fonttbl\f0\fnil\fcharset0 Geneva;\f1\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;\red0\green116\blue0;}
 \margl1440\margr1440\vieww13080\viewh12220\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 Mac VM 4.2.2b1 mach-o build for Carbon with Closures and UTF-8 plus 32bit clean.\
+\f0\fs24 \cf0 Mac VM 4.2.3b1 mach-o build for Carbon with Closures and UTF-8 plus 32bit clean.\
 \
 Support for Croquet, support for Safari, support for TK4/Sophie, support for Multiple Windows/Ffenestri, full GC instrumentation, configurable quartz flush drawing, MacIntel Machines, mappable mouse buttons, Safari and Firefox browser support, with Closure support\
 \
@@ -14,9 +14,39 @@
 May 7th, 2009 (4.1.1b2)\
 Aug 20th, 2009 (4.2.1b1)\
 Sept 17th, 2009 (4.2.2b1)\
+Mar 13th, 2010 (4.2.3b1)\
 \
+\
+\
 Still yet to do, in future versions -> Verify that file delete rename etc works on aliases, not the targets. (Yawn, someday)\
 \
+4.2.3b1   We update to VMMaker 160\
+\
+ Reference Mantis 7405: Array new: SmallInteger maxVal broken.\
+ Reference Mantis 7407: BitBlt. Incorrect alpha values for several rules.\
+ Reference Mantis 7421: Bug in Interpreter>>primitiveNextPut:\
+ (Various 64bit fixes which don't apply to this 32bit VM)\
+ \
+ Put ObjectiveCPlugin.bundle to 1.1.2\
+ Removed SparklePlugin because of file copy issues on squeak 4.0 build process. bad sym links\
+\
+ **** This VM includes some features not in VMMaker yet *****\
+ (a) primitiveAsyncFileOpen: 64bit \
+ (b) explicit declare for primitiveShowHostWindow:\
+ (c) primitive for microsecond clock\
+ (f) statGCTime, statFullGCMSecs,statIGCDeltaTime,statIncrGCMSecs go to 64bit for \
+ microscecond clock\
+ (e) primitiveVMParameter changes to pull back 64bit values\
+ (f) JPEGReaderPlugin, work to make 64bit clean\
+ (g) primitiveMIDIGetPortName: 64bit fix\
+\
+\
+ NSCursorWrapper.m compiler warning cleanup\
+ sqMacMacmain.m compiler warning cleanup\
+ sqMacTime.c add microsecond clock\
+ sqmacWIndowUniversal.c compiler warning cleanup\
+\
+\
 4.2.2b1 We update system to 10.6.1 and newest xCode \
  Build powerpc VM with gcc 4.0\
  Run Static Analyser \

Modified: trunk/platforms/Mac OS/vm/NSCursorWrappers.m
===================================================================
--- trunk/platforms/Mac OS/vm/NSCursorWrappers.m 2010-03-11 19:11:11 UTC (rev 2155)
+++ trunk/platforms/Mac OS/vm/NSCursorWrappers.m 2010-03-14 07:32:25 UTC (rev 2156)
@@ -95,7 +95,7 @@
  bitsPerPixel: 0];
       {
  unsigned *planes[5];
- [bitmap getBitmapDataPlanes: planes];
+ [bitmap getBitmapDataPlanes:(unsigned char **) planes];
  unsigned* src= (unsigned*)cursorBitsIndex;
  unsigned* dst= planes[0];
  int i;

Modified: trunk/platforms/Mac OS/vm/sqMacMain.c
===================================================================
--- trunk/platforms/Mac OS/vm/sqMacMain.c 2010-03-11 19:11:11 UTC (rev 2155)
+++ trunk/platforms/Mac OS/vm/sqMacMain.c 2010-03-14 07:32:25 UTC (rev 2156)
@@ -404,7 +404,8 @@
  /* vm build string */
 
     if (id == 1006) {
- return "Mac Carbon 4.2.2b1 17-Sep-09 >6F0202CF-180C-420A-9CE8-411B696D3467<";
+ return "Mac Carbon 4.2.3b1 13-Mar-10 >551DCCD5-0515-4A91-9316-73DCCB7E7C66<";
+// return "Mac Carbon 4.2.2b1 17-Sep-09 >6F0202CF-180C-420A-9CE8-411B696D3467<";
 // return "Mac Carbon 4.2.1b1 19-Aug-09 >4897EDBA-66BA-413A-9117-AC98701639F8<";
 // return "Mac Carbon 4.1.1b2 7-May-09 >028D94A1-439E-4D2D-9894-AF0DE7F057E8<";
 // return "Mac Carbon 4.1.1b1 1-May-09 >56D42F58-DC56-4B75-9C58-6CF5D03605CC<";
@@ -681,7 +682,7 @@
  autopool = objc_msgSend(autopool, selectorInit);
  checkFortilda=(CFStringRef)objc_msgSend((id)aStringRef,selector);
  if (isetoysonastick) {
- int isAbsoluteURL = (CFStringRef)objc_msgSend((id)checkFortilda,isAbsolutePath);
+ int isAbsoluteURL = (int)objc_msgSend((id)checkFortilda,isAbsolutePath);
  if (!isAbsoluteURL) {
  CFStringRef filePath = fixupNonAbsolutePath(checkFortilda);
  standardizedString = (CFStringRef)objc_msgSend((id)filePath,stringByStandardizingPath);

Modified: trunk/platforms/Mac OS/vm/sqMacTime.c
===================================================================
--- trunk/platforms/Mac OS/vm/sqMacTime.c 2010-03-11 19:11:11 UTC (rev 2155)
+++ trunk/platforms/Mac OS/vm/sqMacTime.c 2010-03-14 07:32:25 UTC (rev 2156)
@@ -66,6 +66,23 @@
   return lowResMSecs;
 }
 
+sqLong ioMicroSeconds(void)
+{
+ //API Documented
+ struct timeval now;
+ sqLong theTimeIs;
+
+ gettimeofday(&now, 0);
+ if ((now.tv_usec-= startUpTime.tv_usec) < 0) {
+ now.tv_usec+= 1000000;
+ now.tv_sec-= 1;
+ }
+ now.tv_sec-= startUpTime.tv_sec;
+ theTimeIs = now.tv_usec;
+ theTimeIs = theTimeIs + now.tv_sec * 1000000;
+ return theTimeIs;
+}
+
 int ioMicroMSecs(void)
 {
   struct timeval now;

Modified: trunk/platforms/Mac OS/vm/sqMacWindowUniversal.c
===================================================================
--- trunk/platforms/Mac OS/vm/sqMacWindowUniversal.c 2010-03-11 19:11:11 UTC (rev 2155)
+++ trunk/platforms/Mac OS/vm/sqMacWindowUniversal.c 2010-03-14 07:32:25 UTC (rev 2156)
@@ -802,7 +802,7 @@
 
 int ioSetCursor(sqInt cursorBitsIndex, int offsetX, int offsetY) {
  /* Old version; forward to new version. */
- ioSetCursorWithMask(cursorBitsIndex, nil, offsetX, offsetY);
+ ioSetCursorWithMask(cursorBitsIndex, 0, offsetX, offsetY);
  return 0;
 }
 
@@ -824,7 +824,7 @@
  if (gSqueakHeadless && !browserActiveAndDrawingContextOk()) return 0;
  biggerCursorActive = false;
 
- if (cursorMaskIndex == nil) {
+ if (cursorMaskIndex == 0) {
  for (i = 0; i < 16; i++) {
  macCursor.data[i] = CFSwapInt16BigToHost((short)(checkedLongAt(cursorBitsIndex + (4 * i)) >> 16)) & 0xFFFF;
  macCursor.mask[i] = CFSwapInt16BigToHost((short)(checkedLongAt(cursorBitsIndex + (4 * i)) >> 16)) & 0xFFFF;
@@ -1080,7 +1080,7 @@
  // (bounds are greater/equal or kMaximizeRes not set) and
  // (depth is less/equal or kShallowDepth not set) and
  // (request match or kAbsoluteRequest not set)
- if ( nil == requestRecPtr->displayMode
+ if ( 0 == requestRecPtr->displayMode
  &&
  ( (horizontal >= requestRecPtr->reqHorizontal &&
  vertical >= requestRecPtr->reqVertical)