[Vm-dev] [commit][3697] Turn ARC On for 64bit compiles,
don't make MIDI,
fix various issues with bridge and windowIndex for ARC,
fix parseArgument data type warning
commits at squeakvm.org
commits at squeakvm.org
Thu May 5 17:57:30 UTC 2016
Revision: 3697
Author: johnmci
Date: 2016-05-05 10:57:28 -0700 (Thu, 05 May 2016)
Log Message:
-----------
Turn ARC On for 64bit compiles, don't make MIDI, fix various issues with bridge and windowIndex for ARC, fix parseArgument data type warning
Modified Paths:
--------------
branches/Cog/build.macos32x86/common/Makefile.flags
branches/Cog/build.macos32x86/common/Makefile.vm
branches/Cog/build.macos64x64/common/Makefile.flags
branches/Cog/build.macos64x64/common/Makefile.vm
branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext
branches/Cog/platforms/iOS/plugins/HostWindowPlugin/sqMacHostWindow.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m
Modified: branches/Cog/build.macos32x86/common/Makefile.flags
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.flags 2016-05-05 17:18:10 UTC (rev 3696)
+++ branches/Cog/build.macos32x86/common/Makefile.flags 2016-05-05 17:57:28 UTC (rev 3697)
@@ -9,7 +9,7 @@
SDKs:=MacOSX10.12.sdk MacOSX10.11.sdk MacOSX10.10.sdk MacOSX10.9.sdk
SDK:=$(firstword $(realpath $(addprefix $(SDKsDIR)/, $(SDKs))))
TARGET_ARCH:=i386
-TARGET_VERSION_MIN:=10.6
+TARGET_VERSION_MIN:=10.7
CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \
-arch $(TARGET_ARCH) \
@@ -17,6 +17,7 @@
-fvisibility=default -fwrapv \
-fmacro-backtrace-limit=0 -fdiagnostics-show-note-include-stack \
-fmessage-length=0 -fpascal-strings -fasm-blocks -fstrict-aliasing \
+ -fobjc-weak \
-isysroot $(SDK) \
-include $(PLATDIR)/iOS/vm/SqueakPureObjc_Prefix.pch
Modified: branches/Cog/build.macos32x86/common/Makefile.vm
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.vm 2016-05-05 17:18:10 UTC (rev 3696)
+++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-05-05 17:57:28 UTC (rev 3697)
@@ -54,7 +54,7 @@
CROSSSRC:= $(wildcard $(CROSSDIR)/*.c)
#XEX:= ... %/sqMacV2Browser.m ...
XEX:=%/sqSqueakMainApplication+screen.m %/sqMacV2Window.m \
- %/SqViewBitmapConversion.m %/SqViewClut.m
+ %/SqViewBitmapConversion.m
OSXSRC=$(wildcard $(OSXDIR)/*.c) $(wildcard $(OSXDIR)/*.m) \
$(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \
$(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m)
Modified: branches/Cog/build.macos64x64/common/Makefile.flags
===================================================================
--- branches/Cog/build.macos64x64/common/Makefile.flags 2016-05-05 17:18:10 UTC (rev 3696)
+++ branches/Cog/build.macos64x64/common/Makefile.flags 2016-05-05 17:57:28 UTC (rev 3697)
@@ -9,7 +9,7 @@
SDKs:=MacOSX10.12.sdk MacOSX10.11.sdk MacOSX10.10.sdk MacOSX10.9.sdk
SDK:=$(firstword $(realpath $(addprefix $(SDKsDIR)/, $(SDKs))))
TARGET_ARCH:=x86_64
-TARGET_VERSION_MIN:=10.6
+TARGET_VERSION_MIN:=10.7
CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \
-arch $(TARGET_ARCH) \
@@ -17,6 +17,7 @@
-fvisibility=default -fwrapv \
-fmacro-backtrace-limit=0 -fdiagnostics-show-note-include-stack \
-fmessage-length=0 -fpascal-strings -fasm-blocks -fstrict-aliasing \
+ -fobjc-arc \
-isysroot $(SDK) \
-include $(PLATDIR)/iOS/vm/SqueakPureObjc_Prefix.pch
Modified: branches/Cog/build.macos64x64/common/Makefile.vm
===================================================================
--- branches/Cog/build.macos64x64/common/Makefile.vm 2016-05-05 17:18:10 UTC (rev 3696)
+++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-05-05 17:57:28 UTC (rev 3697)
@@ -54,7 +54,7 @@
CROSSSRC:= $(wildcard $(CROSSDIR)/*.c)
#XEX:= ... %/sqMacV2Browser.m ...
XEX:=%/sqSqueakMainApplication+screen.m %/sqMacV2Window.m \
- %/SqViewBitmapConversion.m %/SqViewClut.m
+ %/SqViewBitmapConversion.m
OSXSRC=$(wildcard $(OSXDIR)/*.c) $(wildcard $(OSXDIR)/*.m) \
$(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \
$(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m)
Modified: branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext 2016-05-05 17:18:10 UTC (rev 3696)
+++ branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext 2016-05-05 17:57:28 UTC (rev 3697)
@@ -5,7 +5,6 @@
BochsX64Plugin \
GdbARMPlugin \
CroquetPlugin \
-MIDIPlugin \
Mpeg3Plugin \
SqueakFFIPrims \
SqueakSSL \
Modified: branches/Cog/platforms/iOS/plugins/HostWindowPlugin/sqMacHostWindow.m
===================================================================
--- branches/Cog/platforms/iOS/plugins/HostWindowPlugin/sqMacHostWindow.m 2016-05-05 17:18:10 UTC (rev 3696)
+++ branches/Cog/platforms/iOS/plugins/HostWindowPlugin/sqMacHostWindow.m 2016-05-05 17:57:28 UTC (rev 3697)
@@ -57,7 +57,7 @@
sqInt closeWindow(sqInt windowIndex) {
NSWindow *windowHandle;
- windowHandle = windowHandleFromIndex(windowIndex);
+ windowHandle = (__bridge NSWindow*) windowHandleFromIndex(windowIndex);
if(windowHandle == NULL)
return 0;
windowBlockFromIndex(windowIndex)->context = NULL;
@@ -104,7 +104,7 @@
sqInt ioSetTitleOfWindow(sqInt windowIndex, char * newTitle, sqInt sizeOfTitle) {
NSString *title = [[NSString alloc] initWithBytes:newTitle length:sizeOfTitle encoding:NSUTF8StringEncoding];
[[[NSApplication sharedApplication] mainWindow] setTitle:title];
- [title release];
+ RELEASEOBJ(title);
return 1;
}
Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m
===================================================================
--- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m 2016-05-05 17:18:10 UTC (rev 3696)
+++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakAppDelegate.m 2016-05-05 17:57:28 UTC (rev 3697)
@@ -56,7 +56,7 @@
sqInt width,height;
windowDescriptorBlock *windowBlock;
- id createdWindow = [self createPossibleWindow];
+ NSObject * createdWindow = [self createPossibleWindow];
extern sqInt getSavedWindowSize(void); //This is VM Callback
extern sqInt setSavedWindowSize(sqInt value); //This is VM Callback
@@ -65,7 +65,7 @@
width = ((unsigned) getSavedWindowSize()) >> 16;
height = getSavedWindowSize() & 0xFFFF;
windowBlock = AddWindowBlock();
- windowBlock->handle = createdWindow;
+ windowBlock->handle = (__bridge void*) createdWindow;
windowBlock->context = nil;
windowBlock->updateArea = CGRectZero;
width = (usqInt) ioScreenSize() >> 16;
Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m
===================================================================
--- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m 2016-05-05 17:18:10 UTC (rev 3696)
+++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m 2016-05-05 17:57:28 UTC (rev 3697)
@@ -53,7 +53,7 @@
sqSqueakScreenAndWindow *getMainWindowDelegate() {
#ifdef BUILD_FOR_OSX
- return ((NSWindow *) windowHandleFromIndex(1)).delegate;
+ return ((__bridge NSWindow *) windowHandleFromIndex(1)).delegate;
#else
return [gDelegateApp screenAndWindow];
#endif
Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2016-05-05 17:18:10 UTC (rev 3696)
+++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2016-05-05 17:57:28 UTC (rev 3697)
@@ -425,7 +425,7 @@
evt.value2 = 0;
evt.value3 = 0;
evt.value4 = 0;
- evt.windowIndex = windowIndexFromHandle((wHandleType)window);
+ evt.windowIndex = windowIndexFromHandle((__bridge wHandleType)window);
[self pushEventToQueue: (sqInputEvent *) &evt];
interpreterProxy->signalSemaphoreWithIndex(gDelegateApp.squeakApplication.inputSemaphoreIndex);
Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h 2016-05-05 17:18:10 UTC (rev 3696)
+++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication.h 2016-05-05 17:57:28 UTC (rev 3697)
@@ -45,7 +45,7 @@
}
@property (nonatomic,strong) NSCursor *squeakCursor;
-- (NSInteger) parseArgument: (NSString *) argData peek: (char *) peek;
+- (int) parseArgument: (NSString *) argData peek: (char *) peek;
- (void) parseArgs: (NSArray *) args;
- (void) parseEnv: (NSDictionary *) env;
- (long long) strtobkm: (const char *) chr;
Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m 2016-05-05 17:18:10 UTC (rev 3696)
+++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXDropAPI.m 2016-05-05 17:57:28 UTC (rev 3697)
@@ -53,7 +53,7 @@
char* dropRequestFileName(sqInt dropIndex) {
/* return name of file or NULL if error */
- sqSqueakOSXOpenGLView *view = ((sqSqueakOSXScreenAndWindow*)((NSWindow *)windowHandleFromIndex(1)).delegate).mainViewOnWindow;
+ sqSqueakOSXOpenGLView *view = ((sqSqueakOSXScreenAndWindow*)((__bridge NSWindow *)windowHandleFromIndex(1)).delegate).mainViewOnWindow;
NSString *fileNameString = [view dragFileNameStringAtIndex: dropIndex];
return (char *) [fileNameString UTF8String];
}
More information about the Vm-dev
mailing list