Vm-dev January 2015

vm-dev@lists.squeakfoundation.org

22 participants
111 discussions

[squeak-dev] Re: [Vm-dev] [OSProcess] forking and file descriptors
by Max Leske 09 Jan '15

09 Jan '15

(Resending with proper subject…) > On 08 Jan 2015, at 20:48, squeak-dev-request(a)lists.squeakfoundation.org <mailto:squeak-dev-request@lists.squeakfoundation.org> wrote: > > From: "David T. Lewis" <lewis(a)mail.msen.com <mailto:lewis@mail.msen.com>> > Subject: [squeak-dev] Re: [Vm-dev] [OSProcess] forking and file > descriptors > > On Thu, Jan 08, 2015 at 11:37:48AM +0100, Max Leske wrote: >> >> Hi >> >> We currently use ImageSegment to create snapshots of our object graphs. To ensure consistency (and for performance reasons) we create a fork of the image and then run the segment creation in the fork. We???ve always had minor issues with TCP sockets but they are pretty rare and have never corrupted any data (we close the TCP connections in the child). >> >> Recently however, we created a new application which also makes heavy use of a database and now it seems that forking creates a real problem. In anticipation of possible problems I opted to destroy all sockets (with Socket>>destroy) in the fork, thinking that, since all file descriptors are copies of the ones in the parent process, the sockets in the parent process should be unaffected [1], [2]. >> With that mechanism in place however, we are seeing very weird things, such as multiples sockets in the parent (!) having the same file handle (which leads to the wrong data being read from the database and, in turn, corrupt objects). >> >> AFAICT, the OSProcess plugin doesn???t offer any way of dealing with such problems so I was wondering if anybody has had any experience with these kinds of issues and whether there is some kind of best practice. >> >> I am aware that the most simple option is to close the sockets in the parent before forking, but that will mean that we would have to wait for all database connections to finish executing, then blocking them to prevent new connections to the database. Depending on the time a query takes (which may well be a couple of seconds in our case) clients would need to wait for quite a long time before their request can be answered (and this scenario of course assumes that we only close the database sockets and leave the TCP sockets open???). >> >> So under the condition that I need to fork that image, what is the best way to deal with open file descriptors? >> >> >> Thanks for your time. >> Max >> >> [1] http://man7.org/linux/man-pages/man2/fork.2.html <http://man7.org/linux/man-pages/man2/fork.2.html> >> [2] http://man7.org/linux/man-pages/man2/clone.2.html <http://man7.org/linux/man-pages/man2/clone.2.html> > > The only file descriptor (socket or file) that is directly controlled by > forkSqueak is the socket connection to the X11 display. That is done via > the XDisplayControlPlugin. Everything else needs to be handled by the > image (including the changes file BTW). True, I’d never thought of that… > > For connections such as those to a database, I think that you would want to > maintain complete control of this in your image, such that you would ensure > that you have one and only one of the images interacting with any given socket. > > You can probably do this either before or after forking, whichever might > make more sense to you. If you handle it after the forkSqueak, use the > result of the forkSqueak to determine which image is the child and which > is the parent. That’s what I’m trying to do. The problem I face is that the database queries run in a separate process (Smalltalk process in the VM). Once I’m in the child process, there’s always a small window in which the scheduler might run that process before I can terminate it or do something else. My understanding from the C code (from reading man fork(2) and man clone(2)) is that sending Socket>>destroy (which does a close()) shouldn’t have any effect on the socket in the parent. My guess is that things get hairy when the process with the database queries gets processor time before I can destroy the sockets. When that happens, I suddenly have two processes reading from AND writing to the same socket (which can’t be good…). I just realized, there are BlockClosure>>valueUnpreemptively and BlockClosure>>valueUninterruptably. Maybe a can wrap the the code in the fork into such a block somehow to prevent the other processes from running? Thanks Dave. > > I don't know if this helps, if not please keep askng questions. > > Dave

1 0

Re: Squeak-dev Digest, Vol 145, Issue 3
by Max Leske 09 Jan '15

09 Jan '15

> On 08 Jan 2015, at 20:48, squeak-dev-request(a)lists.squeakfoundation.org wrote: > > Date: Thu, 8 Jan 2015 16:56:30 +0100 > From: Henrik Johansen <henrik.s.johansen(a)veloxit.no <mailto:henrik.s.johansen@veloxit.no>> > Subject: [squeak-dev] Re: [Vm-dev] [OSProcess] forking and file > descriptors > > >> On 08 Jan 2015, at 11:37 , Max Leske <maxleske(a)gmail.com <mailto:maxleske@gmail.com>> wrote: >> >> >> Hi >> >> We currently use ImageSegment to create snapshots of our object graphs. To ensure consistency (and for performance reasons) we create a fork of the image and then run the segment creation in the fork. We’ve always had minor issues with TCP sockets but they are pretty rare and have never corrupted any data (we close the TCP connections in the child). >> >> Recently however, we created a new application which also makes heavy use of a database and now it seems that forking creates a real problem. In anticipation of possible problems I opted to destroy all sockets (with Socket>>destroy) in the fork, thinking that, since all file descriptors are copies of the ones in the parent process, the sockets in the parent process should be unaffected [1], [2]. >> With that mechanism in place however, we are seeing very weird things, such as multiples sockets in the parent (!) having the same file handle (which leads to the wrong data being read from the database and, in turn, corrupt objects). >> >> AFAICT, the OSProcess plugin doesn’t offer any way of dealing with such problems so I was wondering if anybody has had any experience with these kinds of issues and whether there is some kind of best practice. >> >> I am aware that the most simple option is to close the sockets in the parent before forking, but that will mean that we would have to wait for all database connections to finish executing, then blocking them to prevent new connections to the database. Depending on the time a query takes (which may well be a couple of seconds in our case) clients would need to wait for quite a long time before their request can be answered (and this scenario of course assumes that we only close the database sockets and leave the TCP sockets open…). >> >> So under the condition that I need to fork that image, what is the best way to deal with open file descriptors? >> >> >> Thanks for your time. >> Max >> >> [1] http://man7.org/linux/man-pages/man2/fork.2.html <http://man7.org/linux/man-pages/man2/fork.2.html> >> [2] http://man7.org/linux/man-pages/man2/clone.2.html <http://man7.org/linux/man-pages/man2/clone.2.html> > > Well... > If I understand the source correctly (at least on Unix, https://github.com/pharo-project/pharo-vm/blob/master/platforms/unix/plugin… <https://github.com/pharo-project/pharo-vm/blob/master/platforms/unix/plugin…> <https://github.com/pharo-project/pharo-vm/blob/master/platforms/unix/plugin… <https://github.com/pharo-project/pharo-vm/blob/master/platforms/unix/plugin…>>) > The socketHandle in a Socket instance is a pointer to a private (platform-specific) struct. > That struct again has a handle to the native socket, which I assume is what gets copied when you fork a process? > > Socket >> primDestroySocket frees the memory pointed to by socketHandle. Hm… that gives me an idea: assume that everything works as advertised and that the child process gets copies of the socket descriptors (which can be closed safely without intefering with the parent). If I’m right, the Socket instances in the image hold on to the address of the *parent* handle (in an inst var). So now, when I close a socket with #primSocketDestroy:, the handle passed to the plugin will be the handle of the parent socket (although it sounds strange that the child should be able to close a file descriptor of its parent…). That would mean that I must not close any sockets in the child. One option, it seems to me, is to suspend all processes that use sockets. Terminating them might pose another problem, if socket destruction is part of an unwind block in one of the processes (e.g. TCP connections in Seaside) then sockets will be destroyed during termination. Another option: set all the socket handles to nil, then terminate the processes (yes ugly, but it might just work…). > So, are you using clone or fork to create a fork of the image? OSProcess uses plain fork() (in forkSqueak()). That’s what I use from the image. > If their memory is shared (clone) instead of copied (fork), you might be kicking the feet out from under the parent image as well, so to speak… From my understanding the file descriptors should be copied (fork). So that shouldn’t happen (but see above…). Thanks Henry. > > Cheers, > Henry

1 0

Re: Squeak-dev Digest, Vol 145, Issue 3
by Max Leske 09 Jan '15

09 Jan '15

> On 08 Jan 2015, at 20:48, squeak-dev-request(a)lists.squeakfoundation.org wrote: > > From: "David T. Lewis" <lewis(a)mail.msen.com <mailto:lewis@mail.msen.com>> > Subject: [squeak-dev] Re: [Vm-dev] [OSProcess] forking and file > descriptors > > On Thu, Jan 08, 2015 at 11:37:48AM +0100, Max Leske wrote: >> >> Hi >> >> We currently use ImageSegment to create snapshots of our object graphs. To ensure consistency (and for performance reasons) we create a fork of the image and then run the segment creation in the fork. We???ve always had minor issues with TCP sockets but they are pretty rare and have never corrupted any data (we close the TCP connections in the child). >> >> Recently however, we created a new application which also makes heavy use of a database and now it seems that forking creates a real problem. In anticipation of possible problems I opted to destroy all sockets (with Socket>>destroy) in the fork, thinking that, since all file descriptors are copies of the ones in the parent process, the sockets in the parent process should be unaffected [1], [2]. >> With that mechanism in place however, we are seeing very weird things, such as multiples sockets in the parent (!) having the same file handle (which leads to the wrong data being read from the database and, in turn, corrupt objects). >> >> AFAICT, the OSProcess plugin doesn???t offer any way of dealing with such problems so I was wondering if anybody has had any experience with these kinds of issues and whether there is some kind of best practice. >> >> I am aware that the most simple option is to close the sockets in the parent before forking, but that will mean that we would have to wait for all database connections to finish executing, then blocking them to prevent new connections to the database. Depending on the time a query takes (which may well be a couple of seconds in our case) clients would need to wait for quite a long time before their request can be answered (and this scenario of course assumes that we only close the database sockets and leave the TCP sockets open???). >> >> So under the condition that I need to fork that image, what is the best way to deal with open file descriptors? >> >> >> Thanks for your time. >> Max >> >> [1] http://man7.org/linux/man-pages/man2/fork.2.html <http://man7.org/linux/man-pages/man2/fork.2.html> >> [2] http://man7.org/linux/man-pages/man2/clone.2.html <http://man7.org/linux/man-pages/man2/clone.2.html> > > The only file descriptor (socket or file) that is directly controlled by > forkSqueak is the socket connection to the X11 display. That is done via > the XDisplayControlPlugin. Everything else needs to be handled by the > image (including the changes file BTW). True, I’d never thought of that… > > For connections such as those to a database, I think that you would want to > maintain complete control of this in your image, such that you would ensure > that you have one and only one of the images interacting with any given socket. > > You can probably do this either before or after forking, whichever might > make more sense to you. If you handle it after the forkSqueak, use the > result of the forkSqueak to determine which image is the child and which > is the parent. That’s what I’m trying to do. The problem I face is that the database queries run in a separate process (Smalltalk process in the VM). Once I’m in the child process, there’s always a small window in which the scheduler might run that process before I can terminate it or do something else. My understanding from the C code (from reading man fork(2) and man clone(2)) is that sending Socket>>destroy (which does a close()) shouldn’t have any effect on the socket in the parent. My guess is that things get hairy when the process with the database queries gets processor time before I can destroy the sockets. When that happens, I suddenly have two processes reading from AND writing to the same socket (which can’t be good…). I just realized, there are BlockClosure>>valueUnpreemptively and BlockClosure>>valueUninterruptably. Maybe a can wrap the the code in the fork into such a block somehow to prevent the other processes from running? Thanks Dave. > > I don't know if this helps, if not please keep askng questions. > > Dave

1 0

[OSProcess] forking and file descriptors
by Max Leske 08 Jan '15

08 Jan '15

Hi We currently use ImageSegment to create snapshots of our object graphs. To ensure consistency (and for performance reasons) we create a fork of the image and then run the segment creation in the fork. We’ve always had minor issues with TCP sockets but they are pretty rare and have never corrupted any data (we close the TCP connections in the child). Recently however, we created a new application which also makes heavy use of a database and now it seems that forking creates a real problem. In anticipation of possible problems I opted to destroy all sockets (with Socket>>destroy) in the fork, thinking that, since all file descriptors are copies of the ones in the parent process, the sockets in the parent process should be unaffected [1], [2]. With that mechanism in place however, we are seeing very weird things, such as multiples sockets in the parent (!) having the same file handle (which leads to the wrong data being read from the database and, in turn, corrupt objects). AFAICT, the OSProcess plugin doesn’t offer any way of dealing with such problems so I was wondering if anybody has had any experience with these kinds of issues and whether there is some kind of best practice. I am aware that the most simple option is to close the sockets in the parent before forking, but that will mean that we would have to wait for all database connections to finish executing, then blocking them to prevent new connections to the database. Depending on the time a query takes (which may well be a couple of seconds in our case) clients would need to wait for quite a long time before their request can be answered (and this scenario of course assumes that we only close the database sockets and leave the TCP sockets open…). So under the condition that I need to fork that image, what is the best way to deal with open file descriptors? Thanks for your time. Max [1] http://man7.org/linux/man-pages/man2/fork.2.html [2] http://man7.org/linux/man-pages/man2/clone.2.html

4 3

Spur support for restricted memory footprint
by Chris Muller 08 Jan '15

08 Jan '15

Hi Eliot, today I was working and remembered that you asked me to post a reminder request about the ability to restrict a Spur VM's memory expansion via -mmap or -memory parameters. It can be useful when you want to prevent an image from being able to consume more resources from the machine than you want.

3 2

Changes needed to platforms/Cross/plugins
by Eliot Miranda 08 Jan '15

08 Jan '15

Hi David, Hi All, I need to make some changes to platforms/Cross/plugins, which is shared between the trunk vm and the Cog branch. 1. DOUBLE_WORD_ALIGNMENT changes to OBJECTS_32BIT_ALIGNED. In Spur objects are always 64-bit aligned, even in the 32-bit version, so none of the slow access to avoid unaligned float access is necessary. I've written it like this in platforms/Cross/vm/sqMemoryAccess.h. The changes begin on the #if (SQ_IMAGE64 || SPURVM) line #if (SQ_VI_BYTES_PER_WORD == 4) # define SQ_IMAGE32 1 #else # define SQ_IMAGE64 1 #endif #if (SQ_IMAGE64 || SPURVM) # define OBJECTS_32BIT_ALIGNED 0 #else # define OBJECTS_32BIT_ALIGNED 1 #endif 2. platforms/Cross/plugins/RePlugin/config.h gets renamed to platforms/Cross/plugins/RePlugin/reconfig.h to avoid conflicts with the VM's config.h I'm not sure that I have permission to change trunk. But if I do would it be OK if I made these changes? If not, would you, David, make the change to trunk's platforms/Cross/vm/sqMemoryAccess.h after which I'll check-in the platforms/Cross/plugins changes? -- best, Eliot

2 4

[commit][3221] Rename RePlugin/config.h to RePlugin/reConfig. h to eliminate conflict with VM's
by commits＠squeakvm.org 08 Jan '15

08 Jan '15

Revision: 3221 Author: eliot Date: 2015-01-07 16:51:28 -0800 (Wed, 07 Jan 2015) Log Message: ----------- Rename RePlugin/config.h to RePlugin/reConfig.h to eliminate conflict with VM's config.h. Nuke some duplications in iOS's HID_Utilities_External.h that cause compilation errors in 64-bits. Nuke the obsolete interp.h from Mac OS. Add the ClipboardExtendedPlugin to the Mac 64-bit stack spur build. Modified Paths: -------------- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int branches/Cog/platforms/iOS/plugins/JoystickTabletPlugin/HID_Utilities_External.h Added Paths: ----------- branches/Cog/platforms/iOS/vm/Common/sqGnu.h branches/Cog/platforms/iOS/vm/OSX/sqConfig.h Removed Paths: ------------- branches/Cog/platforms/Mac OS/vm/Developer/interp.h Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -201,7 +201,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1160,7 +1160,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -202,7 +202,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1164,7 +1164,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -196,7 +196,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1145,7 +1145,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -197,7 +197,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1149,7 +1149,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -193,7 +193,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1328,7 +1328,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -195,7 +195,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1328,7 +1328,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -194,7 +194,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1332,7 +1332,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -196,7 +196,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1332,7 +1332,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -194,7 +194,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1328,7 +1328,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -195,7 +195,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1332,7 +1332,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -190,7 +190,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1313,7 +1313,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -190,7 +190,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1317,7 +1317,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos64x64/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos64x64/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -201,7 +201,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1160,7 +1160,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos64x64/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos64x64/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -196,7 +196,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1145,7 +1145,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos64x64/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos64x64/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -193,7 +193,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1327,7 +1327,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos64x64/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos64x64/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -195,7 +195,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1328,7 +1328,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos64x64/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos64x64/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -194,7 +194,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -1328,7 +1328,7 @@ 941A3B6E09AA144000C9D25A /* sqUnixAsynchFile.h in Headers */, 941A3B6F09AA144000C9D25A /* sqMacImageIO.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, Modified: branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-08 00:51:28 UTC (rev 3221) @@ -3,16 +3,16 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ + 7332D71A1A5DCAE50085E8BA /* sqGnu.h in Headers */ = {isa = PBXBuildFile; fileRef = 7332D7191A5DCAE50085E8BA /* sqGnu.h */; }; 733B2C37106AB74B004652BE /* sqExternalSemaphores.c in Sources */ = {isa = PBXBuildFile; fileRef = 733B2C36106AB74B004652BE /* sqExternalSemaphores.c */; }; 7351A09B100963670035A878 /* sqUnixThreads.c in Sources */ = {isa = PBXBuildFile; fileRef = 7351A09A100963670035A878 /* sqUnixThreads.c */; }; 735B4CA30E8069B7008FA2CA /* VMProfileMacSupportPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 735B4CA20E8069B7008FA2CA /* VMProfileMacSupportPlugin.c */; }; 737888E713D0DE6500C5E1AD /* sqMemoryFence.h in Headers */ = {isa = PBXBuildFile; fileRef = 737888E513D0DE6500C5E1AD /* sqMemoryFence.h */; }; 737888E813D0DE6500C5E1AD /* sqSCCSVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 737888E613D0DE6500C5E1AD /* sqSCCSVersion.h */; }; - 738FB1EA0EE4CF94004BEE42 /* ia32abicc.c in Sources */ = {isa = PBXBuildFile; fileRef = 738FB1E90EE4CF94004BEE42 /* ia32abicc.c */; }; 738FB1ED0EE4D092004BEE42 /* IA32ABI.c in Sources */ = {isa = PBXBuildFile; fileRef = 738FB1EC0EE4D092004BEE42 /* IA32ABI.c */; }; 739C6ED6112DCBB00049B7D3 /* sqTicker.c in Sources */ = {isa = PBXBuildFile; fileRef = 739C6ED5112DCBB00049B7D3 /* sqTicker.c */; }; 739C6ED9112DCBD10049B7D3 /* sqAtomicOps.h in Headers */ = {isa = PBXBuildFile; fileRef = 739C6ED7112DCBD10049B7D3 /* sqAtomicOps.h */; }; @@ -20,6 +20,9 @@ 73B54C530E55EFED00FE780C /* sqUnixVMProfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 73B54C520E55EFED00FE780C /* sqUnixVMProfile.c */; }; 73B96E490E47D7A10079C51B /* sqUnixHeartbeat.c in Sources */ = {isa = PBXBuildFile; fileRef = 73B96E480E47D7A10079C51B /* sqUnixHeartbeat.c */; }; 73BC1BBE0F576864003412C5 /* gcc3x-interp.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BC1BB90F576864003412C5 /* gcc3x-interp.c */; }; + 73C50A191A5DCF4F00FA9451 /* dax64business.h in Headers */ = {isa = PBXBuildFile; fileRef = 73C50A171A5DCF4F00FA9451 /* dax64business.h */; }; + 73C50A1A1A5DCF4F00FA9451 /* x64ia32abicc.c in Sources */ = {isa = PBXBuildFile; fileRef = 73C50A181A5DCF4F00FA9451 /* x64ia32abicc.c */; }; + 73C50A241A5DD04400FA9451 /* sqConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 73C50A231A5DD04400FA9451 /* sqConfig.h */; }; 73D16CAD1A5DBAA100E316FB /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 73D16CAC1A5DBAA100E316FB /* config.h */; }; 73DFFAC018D380C200C3C543 /* AioPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73DFFABF18D380C200C3C543 /* AioPlugin.c */; }; 73F1E42E1A5CB5F70072BF0D /* sqMacOpenGL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73F1E4071A5CB5F70072BF0D /* sqMacOpenGL.c */; }; @@ -265,7 +268,7 @@ 941A3C0209AA144000C9D25A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94148CC5080DB5A400E8C647 /* IOKit.framework */; }; 941A3C0309AA144000C9D25A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 944B5B5008F5C7A900611DF8 /* Foundation.framework */; }; 9426FF1F09F489D200ECEDDC /* chartables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF0F09F489D200ECEDDC /* chartables.c */; }; - 9426FF2009F489D200ECEDDC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* config.h */; }; + 9426FF2009F489D200ECEDDC /* reConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1009F489D200ECEDDC /* reConfig.h */; }; 9426FF2109F489D200ECEDDC /* get.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1109F489D200ECEDDC /* get.c */; }; 9426FF2209F489D200ECEDDC /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 9426FF1209F489D200ECEDDC /* internal.h */; }; 9426FF2309F489D200ECEDDC /* pcre.c in Sources */ = {isa = PBXBuildFile; fileRef = 9426FF1309F489D200ECEDDC /* pcre.c */; }; @@ -324,13 +327,13 @@ 664A73DF0300584000A80109 /* SqueakPlugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = SqueakPlugin.icns; sourceTree = "<group>"; }; 664A73E00300584000A80109 /* SqueakScript.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = SqueakScript.icns; sourceTree = "<group>"; }; 66A8FED80300824600A80109 /* sqGnu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqGnu.h; path = Developer/sqGnu.h; sourceTree = "<group>"; }; + 7332D7191A5DCAE50085E8BA /* sqGnu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqGnu.h; sourceTree = "<group>"; }; 733AC8DA0FEAAC4F007C6206 /* version.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = version.c; sourceTree = "<group>"; }; 733B2C36106AB74B004652BE /* sqExternalSemaphores.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqExternalSemaphores.c; sourceTree = "<group>"; }; 7351A09A100963670035A878 /* sqUnixThreads.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixThreads.c; path = vm/sqUnixThreads.c; sourceTree = "<group>"; }; 735B4CA20E8069B7008FA2CA /* VMProfileMacSupportPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = VMProfileMacSupportPlugin.c; path = VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c; sourceTree = "<group>"; }; 737888E513D0DE6500C5E1AD /* sqMemoryFence.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqMemoryFence.h; sourceTree = "<group>"; }; 737888E613D0DE6500C5E1AD /* sqSCCSVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqSCCSVersion.h; sourceTree = "<group>"; }; - 738FB1E90EE4CF94004BEE42 /* ia32abicc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ia32abicc.c; path = IA32ABI/ia32abicc.c; sourceTree = "<group>"; }; 738FB1EC0EE4D092004BEE42 /* IA32ABI.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = IA32ABI.c; path = IA32ABI/IA32ABI.c; sourceTree = "<group>"; }; 739C6ED5112DCBB00049B7D3 /* sqTicker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqTicker.c; sourceTree = "<group>"; }; 739C6ED7112DCBD10049B7D3 /* sqAtomicOps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqAtomicOps.h; sourceTree = "<group>"; }; @@ -338,6 +341,9 @@ 73B54C520E55EFED00FE780C /* sqUnixVMProfile.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixVMProfile.c; path = vm/sqUnixVMProfile.c; sourceTree = "<group>"; }; 73B96E480E47D7A10079C51B /* sqUnixHeartbeat.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixHeartbeat.c; path = vm/sqUnixHeartbeat.c; sourceTree = "<group>"; }; 73BC1BB90F576864003412C5 /* gcc3x-interp.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "gcc3x-interp.c"; sourceTree = "<group>"; }; + 73C50A171A5DCF4F00FA9451 /* dax64business.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dax64business.h; path = IA32ABI/dax64business.h; sourceTree = "<group>"; }; + 73C50A181A5DCF4F00FA9451 /* x64ia32abicc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = x64ia32abicc.c; path = IA32ABI/x64ia32abicc.c; sourceTree = "<group>"; }; + 73C50A231A5DD04400FA9451 /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqConfig.h; sourceTree = "<group>"; }; 73D16CAC1A5DBAA100E316FB /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; }; 73DFFABF18D380C200C3C543 /* AioPlugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = AioPlugin.c; path = AioPlugin/AioPlugin.c; sourceTree = "<group>"; }; 73F1E4071A5CB5F70072BF0D /* sqMacOpenGL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqMacOpenGL.c; sourceTree = "<group>"; }; @@ -486,7 +492,7 @@ 94196AB009974200005962BF /* sqMacWindowUniversal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacWindowUniversal.c; sourceTree = "<group>"; }; 941A3C0C09AA144000C9D25A /* Squeak.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Squeak.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9426FF0F09F489D200ECEDDC /* chartables.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = chartables.c; sourceTree = "<group>"; }; - 9426FF1009F489D200ECEDDC /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; }; + 9426FF1009F489D200ECEDDC /* reConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = reConfig.h; sourceTree = "<group>"; }; 9426FF1109F489D200ECEDDC /* get.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = get.c; sourceTree = "<group>"; }; 9426FF1209F489D200ECEDDC /* internal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = internal.h; sourceTree = "<group>"; }; 9426FF1309F489D200ECEDDC /* pcre.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pcre.c; sourceTree = "<group>"; }; @@ -819,7 +825,8 @@ 738FB1E80EE4CF4B004BEE42 /* IA32ABI */ = { isa = PBXGroup; children = ( - 738FB1E90EE4CF94004BEE42 /* ia32abicc.c */, + 73C50A171A5DCF4F00FA9451 /* dax64business.h */, + 73C50A181A5DCF4F00FA9451 /* x64ia32abicc.c */, ); name = IA32ABI; sourceTree = "<group>"; @@ -973,6 +980,7 @@ isa = PBXGroup; children = ( 73F1E4531A5CBA650072BF0D /* Classes */, + 7332D7191A5DCAE50085E8BA /* sqGnu.h */, 73F1E4801A5CBA650072BF0D /* main.m */, ); name = Common; @@ -1058,6 +1066,7 @@ 73F1E4981A5CBA650072BF0D /* keyBoardStrokeDetails.m */, 73F1E4991A5CBA650072BF0D /* macintoshosxextra.c */, 73F1E49A1A5CBA650072BF0D /* macintoshosxextra.h */, + 73C50A231A5DD04400FA9451 /* sqConfig.h */, 73F1E49B1A5CBA650072BF0D /* sqMacUnixExternalPrims.m */, 73F1E49C1A5CBA650072BF0D /* sqMacV2Browser.h */, 73F1E49D1A5CBA650072BF0D /* sqMacV2Browser.m */, @@ -1109,7 +1118,7 @@ isa = PBXGroup; children = ( 9426FF0F09F489D200ECEDDC /* chartables.c */, - 9426FF1009F489D200ECEDDC /* config.h */, + 9426FF1009F489D200ECEDDC /* reConfig.h */, 9426FF1109F489D200ECEDDC /* get.c */, 9426FF1209F489D200ECEDDC /* internal.h */, 9426FF1309F489D200ECEDDC /* pcre.c */, @@ -1699,7 +1708,7 @@ 941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */, 941A3B6709AA144000C9D25A /* interp.h in Headers */, 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */, - 9426FF2009F489D200ECEDDC /* config.h in Headers */, + 9426FF2009F489D200ECEDDC /* reconfig.h in Headers */, 9426FF2209F489D200ECEDDC /* internal.h in Headers */, 9426FF2409F489D200ECEDDC /* pcre.h in Headers */, 9426FF2509F489D200ECEDDC /* rePlugin.h in Headers */, @@ -1771,6 +1780,9 @@ 73F1E5221A5CBA650072BF0D /* sqSqueakOSXScreenAndWindow.h in Headers */, 73F1E5241A5CBA650072BF0D /* sqSqueakOSXView.h in Headers */, 73D16CAD1A5DBAA100E316FB /* config.h in Headers */, + 7332D71A1A5DCAE50085E8BA /* sqGnu.h in Headers */, + 73C50A191A5DCF4F00FA9451 /* dax64business.h in Headers */, + 73C50A241A5DD04400FA9451 /* sqConfig.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1802,7 +1814,7 @@ 08773EB400C6A1C4C0A80109 /* Project object */ = { isa = PBXProject; buildConfigurationList = 94D95B1D0923E6810034C6F0 /* Build configuration list for PBXProject "CoreVM" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -1979,7 +1991,6 @@ A2835CFF0E07A13300308978 /* sqHeapMap.c in Sources */, 73B96E490E47D7A10079C51B /* sqUnixHeartbeat.c in Sources */, 73B54C530E55EFED00FE780C /* sqUnixVMProfile.c in Sources */, - 738FB1EA0EE4CF94004BEE42 /* ia32abicc.c in Sources */, 738FB1ED0EE4D092004BEE42 /* IA32ABI.c in Sources */, 73BC1BBE0F576864003412C5 /* gcc3x-interp.c in Sources */, 7351A09B100963670035A878 /* sqUnixThreads.c in Sources */, @@ -2051,6 +2062,7 @@ 73F1E51F1A5CBA650072BF0D /* sqSqueakOSXInfoPlistInterface.m in Sources */, 73F1E5211A5CBA650072BF0D /* sqSqueakOSXOpenGLView.m in Sources */, 73F1E5231A5CBA650072BF0D /* sqSqueakOSXScreenAndWindow.m in Sources */, + 73C50A1A1A5DCF4F00FA9451 /* x64ia32abicc.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2113,7 +2125,7 @@ /Developer/Headers/FlatCarbon, $SRCROOT, ); - SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; + SDKROOT = macosx10.6; }; name = Assert; }; @@ -2266,7 +2278,7 @@ /Developer/Headers/FlatCarbon, $SRCROOT, ); - SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; + SDKROOT = macosx10.6; }; name = Development; }; @@ -2289,7 +2301,7 @@ /Developer/Headers/FlatCarbon, $SRCROOT, ); - SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; + SDKROOT = macosx10.6; }; name = Deployment; }; @@ -2310,7 +2322,7 @@ /Developer/Headers/FlatCarbon, $SRCROOT, ); - SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; + SDKROOT = macosx10.6; }; name = DeploymentSymbols; }; Modified: branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2015-01-08 00:51:28 UTC (rev 3221) @@ -7,6 +7,7 @@ B2DPlugin \ BitBltPlugin \ BMPReadWriterPlugin \ +ClipboardExtendedPlugin \ ZipPlugin \ DropPlugin \ DSAPrims \ Deleted: branches/Cog/platforms/Mac OS/vm/Developer/interp.h =================================================================== --- branches/Cog/platforms/Mac OS/vm/Developer/interp.h 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/platforms/Mac OS/vm/Developer/interp.h 2015-01-08 00:51:28 UTC (rev 3221) @@ -1,3 +0,0 @@ -/* Automatically generated from Squeak on #(6 June 2005 10:59:27 pm) */ - -#define SQ_VI_BYTES_PER_WORD 4 Modified: branches/Cog/platforms/iOS/plugins/JoystickTabletPlugin/HID_Utilities_External.h =================================================================== --- branches/Cog/platforms/iOS/plugins/JoystickTabletPlugin/HID_Utilities_External.h 2015-01-08 00:48:08 UTC (rev 3220) +++ branches/Cog/platforms/iOS/plugins/JoystickTabletPlugin/HID_Utilities_External.h 2015-01-08 00:51:28 UTC (rev 3221) @@ -322,52 +322,6 @@ #endif // ================================== -// HUD utilities interfaces - -// returns calibrated value given raw value passed in -// calibrated value is equal to min and max values returned by HIDGetElementValue since device list built scaled to element reported min and max values -extern long HIDCalibrateValue (long value, pRecElement pElement); - -// returns scaled value given raw value passed in @@ Diff output truncated at 50000 characters. @@

1 0

[commit][3220] Step 2 of replacing DOUBLE_WORD_ALIGNMENT with OBJECTS_32BIT_ALIGNED.
by commits＠squeakvm.org 08 Jan '15

08 Jan '15

Revision: 3220 Author: eliot Date: 2015-01-07 16:48:08 -0800 (Wed, 07 Jan 2015) Log Message: ----------- Step 2 of replacing DOUBLE_WORD_ALIGNMENT with OBJECTS_32BIT_ALIGNED. Update sqMemoryAccess.h and nuke all the refs in the config.h files. Modified Paths: -------------- trunk/platforms/Cross/vm/sqMemoryAccess.h trunk/platforms/Mac OS/vm/config.h trunk/platforms/unix/vm/config.cmake trunk/platforms/win32/vm/sqConfig.h trunk/platforms/win32/vm/sqWin32.h Modified: trunk/platforms/Cross/vm/sqMemoryAccess.h =================================================================== --- trunk/platforms/Cross/vm/sqMemoryAccess.h 2015-01-08 00:42:17 UTC (rev 3219) +++ trunk/platforms/Cross/vm/sqMemoryAccess.h 2015-01-08 00:48:08 UTC (rev 3220) @@ -40,6 +40,12 @@ # define SQ_IMAGE64 1 #endif +#if (SQ_IMAGE64 || SPURVM) +# define OBJECTS_32BIT_ALIGNED 0 +#else +# define OBJECTS_32BIT_ALIGNED 1 +#endif + #if (SIZEOF_VOID_P == 4) # define SQ_HOST32 1 #elif (SIZEOF_VOID_P == 8) @@ -129,7 +135,7 @@ these macros to swap words if necessary. This costs no extra and obviates sometimes having to word-swap floats when reading an image. */ -#if defined(DOUBLE_WORD_ALIGNMENT) || defined(DOUBLE_WORD_ORDER) +#if defined(OBJECTS_32BIT_ALIGNED) || defined(DOUBLE_WORD_ORDER) /* this is to allow strict aliasing assumption in the optimizer */ typedef union { double d; int i[sizeof(double) / sizeof(int)]; } _swapper; # ifdef DOUBLE_WORD_ORDER @@ -149,7 +155,7 @@ ((_swapper *)(&floatVarName))->i[0] = *((int *)(intPointerToFloat) + 0); \ ((_swapper *)(&floatVarName))->i[1] = *((int *)(intPointerToFloat) + 1); # endif /*!DOUBLE_WORD_ORDER*/ -#else /*!(DOUBLE_WORD_ORDER||DOUBLE_WORD_ALIGNMENT)*/ +#else /*!(DOUBLE_WORD_ORDER||OBJECTS_32BIT_ALIGNED)*/ /* for machines that allow doubles to be on any word boundary */ # define storeFloatAtPointerfrom(i, floatVarName) \ *((double *) (i)) = (floatVarName); Modified: trunk/platforms/Mac OS/vm/config.h =================================================================== --- trunk/platforms/Mac OS/vm/config.h 2015-01-08 00:42:17 UTC (rev 3219) +++ trunk/platforms/Mac OS/vm/config.h 2015-01-08 00:48:08 UTC (rev 3220) @@ -170,7 +170,6 @@ #endif #define HAVE_LIBDL 1 -/* #undef DOUBLE_WORD_ALIGNMENT */ /* #undef DOUBLE_WORD_ORDER */ /* damage containment */ Modified: trunk/platforms/unix/vm/config.cmake =================================================================== --- trunk/platforms/unix/vm/config.cmake 2015-01-08 00:42:17 UTC (rev 3219) +++ trunk/platforms/unix/vm/config.cmake 2015-01-08 00:48:08 UTC (rev 3220) @@ -106,10 +106,10 @@ CONFIG_DEFINE (SIZEOF_LONG_LONG) CONFIG_DEFINE (SIZEOF_VOID_P) -TRY_RUN (DOUBLE_WORD_ALIGNMENT tmp ${bld} ${config}/testDoubleWordAlignment.c) +# TRY_RUN (DOUBLE_WORD_ALIGNMENT tmp ${bld} ${config}/testDoubleWordAlignment.c) TRY_RUN (DOUBLE_WORD_ORDER tmp ${bld} ${config}/testDoubleWordOrder.c) -CONFIG_DEFINE (DOUBLE_WORD_ALIGNMENT) +# CONFIG_DEFINE (DOUBLE_WORD_ALIGNMENT) CONFIG_DEFINE (DOUBLE_WORD_ORDER) # sqPlatformSpecific.h Modified: trunk/platforms/win32/vm/sqConfig.h =================================================================== --- trunk/platforms/win32/vm/sqConfig.h 2015-01-08 00:42:17 UTC (rev 3219) +++ trunk/platforms/win32/vm/sqConfig.h 2015-01-08 00:48:08 UTC (rev 3220) @@ -15,7 +15,6 @@ # endif # if defined(_M_IX86) || defined(X86) /* x86 systems */ -# define DOUBLE_WORD_ALIGNMENT # define DOUBLE_WORD_ORDER /* Note: We include a generic sqWin32.h to override some settings */ # include "sqWin32.h" Modified: trunk/platforms/win32/vm/sqWin32.h =================================================================== --- trunk/platforms/win32/vm/sqWin32.h 2015-01-08 00:42:17 UTC (rev 3219) +++ trunk/platforms/win32/vm/sqWin32.h 2015-01-08 00:48:08 UTC (rev 3220) @@ -59,7 +59,6 @@ #endif #ifdef _MIPS_ -# undef DOUBLE_WORD_ALIGNMENT # define DOUBLE_WORD_ORDER #endif

1 0

[commit][3219] Step one of replacing DOUBLE_WROD_ALIGNMENT with OBJECTS_32BIT_ALIGNED.
by commits＠squeakvm.org 08 Jan '15

08 Jan '15

Revision: 3219 Author: eliot Date: 2015-01-07 16:42:17 -0800 (Wed, 07 Jan 2015) Log Message: ----------- Step one of replacing DOUBLE_WROD_ALIGNMENT with OBJECTS_32BIT_ALIGNED. Rename platforms/Cross/plugins/RePlugin/config.h to reConfig.h to avoid conflicts with the VM's actual config.h file. Modified Paths: -------------- trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c trunk/platforms/Cross/plugins/RePlugin/internal.h trunk/platforms/Cross/plugins/RePlugin/oldInternal.h Added Paths: ----------- trunk/platforms/Cross/plugins/RePlugin/reConfig.h Removed Paths: ------------- trunk/platforms/Cross/plugins/RePlugin/config.h Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c =================================================================== --- trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c 2015-01-07 19:23:24 UTC (rev 3218) +++ trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c 2015-01-08 00:42:17 UTC (rev 3219) @@ -79,32 +79,10 @@ int thisSession = 0; extern struct VirtualMachine * interpreterProxy; -/* Since SQFile instaces are held on the heap in 32-bit-aligned byte arrays we +/* Since SQFile instances are held on the heap in 32-bit-aligned byte arrays we * may need to use memcpy to avoid alignment faults. */ -#if DOUBLE_WORD_ALIGNMENT -static void setFile(SQFile *f, FILE *file) -{ - void *in= (void *)&file; - void *out= (void *)&f->file; - memcpy(out, in, sizeof(FILE *)); -} -#else -# define setFile(f,fileptr) ((f)->file = (fileptr)) -#endif - -#if DOUBLE_WORD_ALIGNMENT -static void setSize(SQFile *f, squeakFileOffsetType size) -{ - void *in= (void *)&size; - void *out= (void *)&f->fileSize; - memcpy(out, in, sizeof(squeakFileOffsetType)); -} -#else -# define setSize(f,size) ((f)->fileSize = (size)) -#endif - -#if DOUBLE_WORD_ALIGNMENT +#if OBJECTS_32BIT_ALIGNED static FILE *getFile(SQFile *f) { FILE *file; @@ -113,11 +91,12 @@ memcpy(out, in, sizeof(FILE *)); return file; } -#else -# define getFile(f) ((FILE *)((f)->file)) -#endif - -#if DOUBLE_WORD_ALIGNMENT +static void setFile(SQFile *f, FILE *file) +{ + void *in= (void *)&file; + void *out= (void *)&f->file; + memcpy(out, in, sizeof(FILE *)); +} static squeakFileOffsetType getSize(SQFile *f) { squeakFileOffsetType size; @@ -126,9 +105,18 @@ memcpy(out, in, sizeof(squeakFileOffsetType)); return size; } -#else +static void setSize(SQFile *f, squeakFileOffsetType size) +{ + void *in= (void *)&size; + void *out= (void *)&f->fileSize; + memcpy(out, in, sizeof(squeakFileOffsetType)); +} +#else /* OBJECTS_32BIT_ALIGNED */ +# define getFile(f) ((FILE *)((f)->file)) +# define setFile(f,fileptr) ((f)->file = (fileptr)) # define getSize(f) ((f)->fileSize) -#endif +# define setSize(f,size) ((f)->fileSize = (size)) +#endif /* OBJECTS_32BIT_ALIGNED */ #if 0 # define pentry(func) do { int fn = fileno(getFile(f)); if (f->isStdioStream) printf("\n"#func "(%s) %lld %d\n", fn == 0 ? "in" : fn == 1 ? "out" : "err", (long long)ftell(getFile(f)), f->lastChar); } while (0) @@ -140,7 +128,8 @@ # define pfail() 0 #endif -sqInt sqFileAtEnd(SQFile *f) { +sqInt +sqFileAtEnd(SQFile *f) { /* Return true if the file's read/write head is at the end of the file. */ if (!sqFileValid(f)) @@ -151,7 +140,8 @@ return ftell(getFile(f)) >= getSize(f); } -sqInt sqFileClose(SQFile *f) { +sqInt +sqFileClose(SQFile *f) { /* Close the given file. */ if (!sqFileValid(f)) @@ -165,7 +155,8 @@ return 1; } -sqInt sqFileDeleteNameSize(char* sqFileName, sqInt sqFileNameSize) { +sqInt +sqFileDeleteNameSize(char* sqFileName, sqInt sqFileNameSize) { char cFileName[1000]; int err; @@ -183,7 +174,8 @@ return 1; } -squeakFileOffsetType sqFileGetPosition(SQFile *f) { +squeakFileOffsetType +sqFileGetPosition(SQFile *f) { /* Return the current position of the file's read/write head. */ squeakFileOffsetType position; @@ -200,7 +192,8 @@ return position; } -sqInt sqFileInit(void) { +sqInt +sqFileInit(void) { /* Create a session ID that is unlikely to be repeated. Zero is never used for a valid session number. Should be called once at startup time. @@ -214,11 +207,11 @@ return 1; } -sqInt sqFileShutdown(void) { - return 1; -} +sqInt +sqFileShutdown(void) { return 1; } -sqInt sqFileOpen(SQFile *f, char* sqFileName, sqInt sqFileNameSize, sqInt writeFlag) { +sqInt +sqFileOpen(SQFile *f, char* sqFileName, sqInt sqFileNameSize, sqInt writeFlag) { /* Opens the given file using the supplied sqFile structure to record its state. Fails with no side effects if f is already open. Files are always opened in binary mode; @@ -337,7 +330,8 @@ return 7; } -size_t sqFileReadIntoAt(SQFile *f, size_t count, char* byteArrayIndex, size_t startIndex) { +size_t +sqFileReadIntoAt(SQFile *f, size_t count, char* byteArrayIndex, size_t startIndex) { /* Read count bytes from the given file into byteArray starting at startIndex. byteArray is the address of the first byte of a Squeak bytes object (e.g. String or ByteArray). startIndex @@ -422,7 +416,8 @@ return pexit(bytesRead); } -sqInt sqFileRenameOldSizeNewSize(char* oldNameIndex, sqInt oldNameSize, char* newNameIndex, sqInt newNameSize) { +sqInt +sqFileRenameOldSizeNewSize(char* oldNameIndex, sqInt oldNameSize, char* newNameIndex, sqInt newNameSize) { char cOldName[1000], cNewName[1000]; int err; @@ -442,7 +437,8 @@ return 1; } -sqInt sqFileSetPosition(SQFile *f, squeakFileOffsetType position) { +sqInt +sqFileSetPosition(SQFile *f, squeakFileOffsetType position) { /* Set the file's read/write head to the given position. */ if (!sqFileValid(f)) @@ -469,7 +465,8 @@ return 1; } -squeakFileOffsetType sqFileSize(SQFile *f) { +squeakFileOffsetType +sqFileSize(SQFile *f) { /* Return the length of the given file. */ if (!sqFileValid(f)) @@ -479,7 +476,8 @@ return getSize(f); } -sqInt sqFileFlush(SQFile *f) { +sqInt +sqFileFlush(SQFile *f) { if (!sqFileValid(f)) return interpreterProxy->success(false); @@ -488,7 +486,8 @@ return 1; } -sqInt sqFileTruncate(SQFile *f,squeakFileOffsetType offset) { +sqInt +sqFileTruncate(SQFile *f,squeakFileOffsetType offset) { if (!sqFileValid(f)) return interpreterProxy->success(false); @@ -499,14 +498,16 @@ } -sqInt sqFileValid(SQFile *f) { +sqInt +sqFileValid(SQFile *f) { return ( (f != NULL) && (getFile(f) != NULL) && (f->sessionID == thisSession)); } -size_t sqFileWriteFromAt(SQFile *f, size_t count, char* byteArrayIndex, size_t startIndex) { +size_t +sqFileWriteFromAt(SQFile *f, size_t count, char* byteArrayIndex, size_t startIndex) { /* Write count bytes to the given writable file starting at startIndex in the given byteArray. (See comment in sqFileReadIntoAt for interpretation of byteArray and startIndex). @@ -537,7 +538,8 @@ return pexit(bytesWritten); } -sqInt sqFileThisSession() { +sqInt +sqFileThisSession() { return thisSession; } #endif /* NO_STD_FILE_SUPPORT */ Deleted: trunk/platforms/Cross/plugins/RePlugin/config.h =================================================================== --- trunk/platforms/Cross/plugins/RePlugin/config.h 2015-01-07 19:23:24 UTC (rev 3218) +++ trunk/platforms/Cross/plugins/RePlugin/config.h 2015-01-08 00:42:17 UTC (rev 3219) @@ -1,48 +0,0 @@ -/* config.h. Generated automatically by configure. */ - -/* On Unix systems config.in is converted by configure into config.h. PCRE is -written in Standard C, but there are a few non-standard things it can cope -with, allowing it to run on SunOS4 and other "close to standard" systems. - -On a non-Unix system you should just copy this file into config.h, and set up -the macros the way you need them. You should normally change the definitions of -HAVE_STRERROR and HAVE_MEMMOVE to 1. Unfortunately, because of the way autoconf -works, these cannot be made the defaults. If your system has bcopy() and not -memmove(), change the definition of HAVE_BCOPY instead of HAVE_MEMMOVE. If your -system has neither bcopy() nor memmove(), leave them both as 0; an emulation -function will be used. */ - -/* Define to empty if the keyword does not work. */ - -/* #undef const */ - -/* Define to `unsigned' if <stddef.h> doesn't define size_t. */ - -/* #undef size_t */ - -/* The following two definitions are mainly for the benefit of SunOS4, which -doesn't have the strerror() or memmove() functions that should be present in -all Standard C libraries. The macros HAVE_STRERROR and HAVE_MEMMOVE should -normally be defined with the value 1 for other systems, but unfortunately we -can't make this the default because "configure" files generated by autoconf -will only change 0 to 1; they won't change 1 to 0 if the functions are not -found. */ - -#define HAVE_STRERROR 1 -#define HAVE_MEMMOVE 1 - -/* There are some non-Unix systems that don't even have bcopy(). If this macro -is false, an emulation is used. If HAVE_MEMMOVE is set to 1, the value of -HAVE_BCOPY is not relevant. */ - -#define HAVE_BCOPY 1 - -/* The value of NEWLINE determines the newline character. The default is to -leave it up to the compiler, but some sites want to force a particular value. -On Unix systems, "configure" can be used to override this default. */ - -#ifndef NEWLINE -#define NEWLINE '\n' -#endif - -/* End */ Modified: trunk/platforms/Cross/plugins/RePlugin/internal.h =================================================================== --- trunk/platforms/Cross/plugins/RePlugin/internal.h 2015-01-07 19:23:24 UTC (rev 3218) +++ trunk/platforms/Cross/plugins/RePlugin/internal.h 2015-01-08 00:42:17 UTC (rev 3219) @@ -40,7 +40,7 @@ #define NEWLINE '\r' #define SQUEAK_PLUGIN -#include "config.h" +#include "reconfig.h" /* To cope with SunOS4 and other systems that lack memmove() but have bcopy(), define a macro for memmove() if HAVE_MEMMOVE is false, provided that HAVE_BCOPY Modified: trunk/platforms/Cross/plugins/RePlugin/oldInternal.h =================================================================== --- trunk/platforms/Cross/plugins/RePlugin/oldInternal.h 2015-01-07 19:23:24 UTC (rev 3218) +++ trunk/platforms/Cross/plugins/RePlugin/oldInternal.h 2015-01-08 00:42:17 UTC (rev 3219) @@ -40,7 +40,7 @@ #define NEWLINE '\r' #define SQUEAK_PLUGIN -#include "config.h" +#include "reconfig.h" /* To cope with SunOS4 and other systems that lack memmove() but have bcopy(), define a macro for memmove() if HAVE_MEMMOVE is false, provided that HAVE_BCOPY Copied: trunk/platforms/Cross/plugins/RePlugin/reConfig.h (from rev 3216, trunk/platforms/Cross/plugins/RePlugin/config.h) =================================================================== --- trunk/platforms/Cross/plugins/RePlugin/reConfig.h (rev 0) +++ trunk/platforms/Cross/plugins/RePlugin/reConfig.h 2015-01-08 00:42:17 UTC (rev 3219) @@ -0,0 +1,49 @@ +/* config.h. Generated automatically by configure. */ +/* renamed to reConfig.h to avoid conflicts with the main config.h */ + +/* On Unix systems config.in is converted by configure into config.h. PCRE is +written in Standard C, but there are a few non-standard things it can cope +with, allowing it to run on SunOS4 and other "close to standard" systems. + +On a non-Unix system you should just copy this file into config.h, and set up +the macros the way you need them. You should normally change the definitions of +HAVE_STRERROR and HAVE_MEMMOVE to 1. Unfortunately, because of the way autoconf +works, these cannot be made the defaults. If your system has bcopy() and not +memmove(), change the definition of HAVE_BCOPY instead of HAVE_MEMMOVE. If your +system has neither bcopy() nor memmove(), leave them both as 0; an emulation +function will be used. */ + +/* Define to empty if the keyword does not work. */ + +/* #undef const */ + +/* Define to `unsigned' if <stddef.h> doesn't define size_t. */ + +/* #undef size_t */ + +/* The following two definitions are mainly for the benefit of SunOS4, which +doesn't have the strerror() or memmove() functions that should be present in +all Standard C libraries. The macros HAVE_STRERROR and HAVE_MEMMOVE should +normally be defined with the value 1 for other systems, but unfortunately we +can't make this the default because "configure" files generated by autoconf +will only change 0 to 1; they won't change 1 to 0 if the functions are not +found. */ + +#define HAVE_STRERROR 1 +#define HAVE_MEMMOVE 1 + +/* There are some non-Unix systems that don't even have bcopy(). If this macro +is false, an emulation is used. If HAVE_MEMMOVE is set to 1, the value of +HAVE_BCOPY is not relevant. */ + +#define HAVE_BCOPY 1 + +/* The value of NEWLINE determines the newline character. The default is to +leave it up to the compiler, but some sites want to force a particular value. +On Unix systems, "configure" can be used to override this default. */ + +#ifndef NEWLINE +#define NEWLINE '\n' +#endif + +/* End */ Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Dec 31 14:28:47 PST 2014 + Wed Jan 7 16:41:51 PST 2015

1 0

[commit][3218] Rename DOUBLE_WORD_ALIGNMENT to OBJECTS_32BIT_ALIGNED and use aligned access on
by commits＠squeakvm.org 07 Jan '15

07 Jan '15

Revision: 3218 Author: eliot Date: 2015-01-07 11:23:24 -0800 (Wed, 07 Jan 2015) Log Message: ----------- Rename DOUBLE_WORD_ALIGNMENT to OBJECTS_32BIT_ALIGNED and use aligned access on Spur. Nuke HAVE_INTERP_H. Add iOS/vm/OSX/config.h. Modified Paths: -------------- branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/platforms/Cross/vm/sqMemoryAccess.h branches/Cog/platforms/Mac OS/vm/config.h branches/Cog/platforms/Plan9/vm/config.h branches/Cog/platforms/RiscOS/vm/config.h branches/Cog/platforms/iOS/vm/iPhone/config.h branches/Cog/platforms/win32/vm/config.h Added Paths: ----------- branches/Cog/platforms/iOS/vm/OSX/config.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-07 18:50:12 UTC (rev 3217) +++ branches/Cog/build.macos64x64/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-01-07 19:23:24 UTC (rev 3218) @@ -20,6 +20,7 @@ 73B54C530E55EFED00FE780C /* sqUnixVMProfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 73B54C520E55EFED00FE780C /* sqUnixVMProfile.c */; }; 73B96E490E47D7A10079C51B /* sqUnixHeartbeat.c in Sources */ = {isa = PBXBuildFile; fileRef = 73B96E480E47D7A10079C51B /* sqUnixHeartbeat.c */; }; 73BC1BBE0F576864003412C5 /* gcc3x-interp.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BC1BB90F576864003412C5 /* gcc3x-interp.c */; }; + 73D16CAD1A5DBAA100E316FB /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 73D16CAC1A5DBAA100E316FB /* config.h */; }; 73DFFAC018D380C200C3C543 /* AioPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73DFFABF18D380C200C3C543 /* AioPlugin.c */; }; 73F1E42E1A5CB5F70072BF0D /* sqMacOpenGL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73F1E4071A5CB5F70072BF0D /* sqMacOpenGL.c */; }; 73F1E42F1A5CB5F70072BF0D /* sqMacOpenGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 73F1E4081A5CB5F70072BF0D /* sqMacOpenGL.h */; }; @@ -337,6 +338,7 @@ 73B54C520E55EFED00FE780C /* sqUnixVMProfile.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixVMProfile.c; path = vm/sqUnixVMProfile.c; sourceTree = "<group>"; }; 73B96E480E47D7A10079C51B /* sqUnixHeartbeat.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixHeartbeat.c; path = vm/sqUnixHeartbeat.c; sourceTree = "<group>"; }; 73BC1BB90F576864003412C5 /* gcc3x-interp.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "gcc3x-interp.c"; sourceTree = "<group>"; }; + 73D16CAC1A5DBAA100E316FB /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; }; 73DFFABF18D380C200C3C543 /* AioPlugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = AioPlugin.c; path = AioPlugin/AioPlugin.c; sourceTree = "<group>"; }; 73F1E4071A5CB5F70072BF0D /* sqMacOpenGL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqMacOpenGL.c; sourceTree = "<group>"; }; 73F1E4081A5CB5F70072BF0D /* sqMacOpenGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqMacOpenGL.h; sourceTree = "<group>"; }; @@ -1031,6 +1033,7 @@ 73F1E4811A5CBA650072BF0D /* OSX */ = { isa = PBXGroup; children = ( + 73D16CAC1A5DBAA100E316FB /* config.h */, 73F1E4821A5CBA650072BF0D /* BitMapConversionLogicFromX11.c */, 73F1E4831A5CBA650072BF0D /* BitMapConversionLogicFromX11.h */, 73F1E4851A5CBA650072BF0D /* SqViewBitmapConversion.h */, @@ -1767,6 +1770,7 @@ 73F1E5201A5CBA650072BF0D /* sqSqueakOSXOpenGLView.h in Headers */, 73F1E5221A5CBA650072BF0D /* sqSqueakOSXScreenAndWindow.h in Headers */, 73F1E5241A5CBA650072BF0D /* sqSqueakOSXView.h in Headers */, + 73D16CAD1A5DBAA100E316FB /* config.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; Modified: branches/Cog/platforms/Cross/vm/sqMemoryAccess.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqMemoryAccess.h 2015-01-07 18:50:12 UTC (rev 3217) +++ branches/Cog/platforms/Cross/vm/sqMemoryAccess.h 2015-01-07 19:23:24 UTC (rev 3218) @@ -16,29 +16,20 @@ #define __sqMemoryAccess_h #include "config.h" +#include "interp.h" -#if defined(HAVE_INTERP_H) -# include "interp.h" -#else -# define SQ_VI_BYTES_PER_WORD 4 /* build a 32-bit VM */ -# warning -# warning *************************************************** -# warning * -# warning * interp.h not found -- defaulting to a 32-bit VM -# warning * -# warning * update your image-side VM sources to the latest -# warning * version to avoid this message -# warning * -# warning *************************************************** -# warning -#endif - #if (SQ_VI_BYTES_PER_WORD == 4) # define SQ_IMAGE32 1 #else # define SQ_IMAGE64 1 #endif +#if (SQ_IMAGE64 || SPURVM) +# define OBJECTS_32BIT_ALIGNED 0 +#else +# define OBJECTS_32BIT_ALIGNED 1 +#endif + #if (SIZEOF_VOID_P == 4) # define SQ_HOST32 1 #elif (SIZEOF_VOID_P == 8) @@ -157,7 +148,7 @@ * Pre-Cog systems stored floats in Mac PowerPC big-endian format. * BigEndianFloats selects this behaviour for backwards-compatibility. * RISC systems typically insist on double-word alignment of double-words, but - * the heap is only word-aligned. DOUBLE_WORD_ALIGNMENT selects word access. + * the heap is only word-aligned. OBJECTS_32BIT_ALIGNED selects word access. */ #if BigEndianFloats && !VMBIGENDIAN /* this is to allow strict aliasing assumption in the optimizer */ @@ -171,7 +162,7 @@ ((_swapper *)(&doubleVar))->i[1] = *((int *)(intPointerToFloat) + 0); \ ((_swapper *)(&doubleVar))->i[0] = *((int *)(intPointerToFloat) + 1); \ } while (0) -# elif defined(DOUBLE_WORD_ALIGNMENT) +# elif defined(OBJECTS_32BIT_ALIGNED) /* this is to allow strict aliasing assumption in the optimizer */ typedef union { double d; int i[sizeof(double) / sizeof(int)]; } _aligner; /* word-based copy for machines with alignment restrictions */ @@ -183,11 +174,11 @@ ((_aligner *)(&doubleVar))->i[0] = *((int *)(intPointerToFloat) + 0); \ ((_aligner *)(&doubleVar))->i[1] = *((int *)(intPointerToFloat) + 1); \ } while (0) -#else /* !(BigEndianFloats && !VMBIGENDIAN) && !DOUBLE_WORD_ALIGNMENT */ +#else /* !(BigEndianFloats && !VMBIGENDIAN) && !OBJECTS_32BIT_ALIGNED */ /* for machines that allow doubles to be on any word boundary */ # define storeFloatAtPointerfrom(i, doubleVar) (*((double *) (i)) = (doubleVar)) # define fetchFloatAtPointerinto(i, doubleVar) ((doubleVar) = *((double *) (i))) -#endif /* !(BigEndianFloats && !VMBIGENDIAN) && !DOUBLE_WORD_ALIGNMENT */ +#endif /* !(BigEndianFloats && !VMBIGENDIAN) && !OBJECTS_32BIT_ALIGNED */ #define storeFloatAtfrom(i, doubleVar) storeFloatAtPointerfrom(pointerForOop(i), doubleVar) #define fetchFloatAtinto(i, doubleVar) fetchFloatAtPointerinto(pointerForOop(i), doubleVar) Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jan 6 14:58:34 PST 2015 + Wed Jan 7 11:22:52 PST 2015 Modified: branches/Cog/platforms/Mac OS/vm/config.h =================================================================== --- branches/Cog/platforms/Mac OS/vm/config.h 2015-01-07 18:50:12 UTC (rev 3217) +++ branches/Cog/platforms/Mac OS/vm/config.h 2015-01-07 19:23:24 UTC (rev 3218) @@ -39,10 +39,6 @@ #ifndef __sq_config_h #define __sq_config_h -/* explicit image width */ - -#define HAVE_INTERP_H 1 - /* package options */ #define USE_X11 1 @@ -101,8 +97,6 @@ /* #undef HAVE_GL_GL_H */ #define HAVE_OPENGL_GL_H 1 -/* #undef NEED_SUNOS_H */ - /* system calls/library functions */ #define AT_EXIT atexit @@ -168,19 +162,18 @@ #endif #define HAVE_LIBDL 1 -/* #undef DOUBLE_WORD_ALIGNMENT */ /* damage containment */ #define DARWIN 1 -#ifdef NEED_SUNOS_H -# include "sunos.h" -#endif - /* other configured variables */ -#define VM_VERSION "4.0" +#if SPURVM +# define VM_VERSION "5.0" +#else +# define VM_VERSION "4.5" +#endif #define VM_MODULE_PREFIX "" /* #undef VM_DLSYM_PREFIX */ #define VM_X11DIR "/usr/X11R6/lib" Modified: branches/Cog/platforms/Plan9/vm/config.h =================================================================== --- branches/Cog/platforms/Plan9/vm/config.h 2015-01-07 18:50:12 UTC (rev 3217) +++ branches/Cog/platforms/Plan9/vm/config.h 2015-01-07 19:23:24 UTC (rev 3218) @@ -43,8 +43,6 @@ #ifndef __sq_config_h #define __sq_config_h -#define HAVE_INTERP_H 1 - /* header files */ #undef HAVE_UNISTD_H @@ -119,7 +117,6 @@ #endif #undef HAVE_LIBDL -/* #undef DOUBLE_WORD_ALIGNMENT */ /* #undef DOUBLE_WORD_ORDER */ /* other configured variables */ Modified: branches/Cog/platforms/RiscOS/vm/config.h =================================================================== --- branches/Cog/platforms/RiscOS/vm/config.h 2015-01-07 18:50:12 UTC (rev 3217) +++ branches/Cog/platforms/RiscOS/vm/config.h 2015-01-07 19:23:24 UTC (rev 3218) @@ -27,5 +27,4 @@ #define SIZEOF_VOID_P 4 -#define HAVE_INTERP_H 1 #define SIZEOF_LONG_LONG 8 Copied: branches/Cog/platforms/iOS/vm/OSX/config.h (from rev 3216, branches/Cog/platforms/Mac OS/vm/config.h) =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/config.h (rev 0) +++ branches/Cog/platforms/iOS/vm/OSX/config.h 2015-01-07 19:23:24 UTC (rev 3218) @@ -0,0 +1,189 @@ +/* config.h. Generated by configure. */ +/* config.h.in -- template for config.h -*- C -*- + * + * Copyright (C) 1996-2014 by Ian Piumarta and other authors/contributors + * listed elsewhere in this file. + * All rights reserved. + * + * This file is part of Unix Squeak. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +/* Author: Ian.Piumarta(a)squeakland.org + * + * Last edited: 2014-12-02 11:16 by eliot.miranda(a)gmail.com + * + * THIS FILE IS A BUG!! It *SHOULD NOT* exist! Any automatically-derived + * configuration should be produced at compile-time, not hard-wired like this + * excressence. But at least for the time being we're stuck with it. + * eem 12/2/2014 11:16 + */ + +#ifndef __sq_config_h +#define __sq_config_h + +/* package options */ + +#define USE_X11 1 +/* #undef USE_X11_GLX */ +#define USE_QUARTZ 1 +#define USE_QUARTZ_CGL 1 +/* #undef USE_RFB */ + +/* libraries */ + +/* #undef HAVE_LIBX11 */ +#define HAVE_LIBXEXT 1 +/* #undef HAVE_LIBDL */ +#define HAVE_DYLD 1 +/* #undef HAVE_LIBFFI */ +/* #undef HAVE_ICONV */ + +/* #undef USE_AUDIO_NONE */ +/* #undef USE_AUDIO_SUN */ +/* #undef USE_AUDIO_NAS */ +/* #undef USE_AUDIO_OSS */ +/* #undef USE_AUDIO_MACOSX */ +/* #undef OSS_DEVICE */ + +/* header files */ + +#define HAVE_UNISTD_H 1 +/* #undef NEED_GETHOSTNAME_P */ + +#define HAVE_DIRENT_H 1 +/* #undef HAVE_SYS_NDIR_H */ +/* #undef HAVE_SYS_DIR_H */ +/* #undef HAVE_NDIR_H */ + +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_3 +#undef HAVE_DLFCN_H +#else +#define HAVE_DLFCN_H 1 +#endif + +#define HAVE_ICONV_H 1 + +#define HAVE_SYS_TIME_H 1 +#define TIME_WITH_SYS_TIME 1 + +#define HAVE_SYS_FILIO_H 1 + +/* #undef HAVE_SYS_AUDIOIO_H */ +/* #undef HAVE_SUN_AUDIOIO_H */ + +/* #undef HAVE_PTY_H */ +#define HAVE_UTIL_H 1 +/* #undef HAVE_LIBUTIL_H */ +/* #undef HAVE_STROPTS_H */ + +/* #undef HAVE_GL_GL_H */ +#define HAVE_OPENGL_GL_H 1 + +/* system calls/library functions */ + +#define AT_EXIT atexit + +#define HAVE_TZSET 1 + +#define HAVE_OPENPTY 1 +/* #undef HAVE_UNIX98_PTYS */ + +#define HAVE_SNPRINTF 1 +/* #undef HAVE___SNPRINTF */ + +#define HAVE_MMAP 1 + +#define HAVE_DYLD 1 + +#define HAVE_LANGINFO_CODESET 1 + +#define HAVE_ALLOCA 1 +#define HAVE_ALLOCA_H 1 + +#define HAVE_UNSETENV 1 + +/* widths of primitive types */ + +#if _LP64 || __x86_64 || __x86_64__ +# define SIZEOF_INT 4 +# define SIZEOF_LONG 8 +# define SIZEOF_LONG_LONG 8 +# define SIZEOF_VOID_P 8 +#endif + +#if (i386 || __i386 || __i386__) || (ppc || __ppc || __ppc__) +# define SIZEOF_INT 4 +# define SIZEOF_LONG 4 +# define SIZEOF_LONG_LONG 8 +# define SIZEOF_VOID_P 4 +#endif + +/* structures */ + +#define HAVE_TM_GMTOFF 1 +#define HAVE_TIMEZONE 1 + +/* typedefs */ + +/* #undef size_t */ + +/* architecture */ + +#define OS_TYPE "unix" + +/* #undef VM_HOST_VENDOR */ +/* #undef VM_HOST_OS */ + +#if defined(__BIG_ENDIAN__) +# define WORDS_BIGENDIAN 1 +# define VMENDIANNESS 1 +#else +# undef WORDS_BIGENDIAN +# define VMENDIANNESS 0 +# define LSB_FIRST 1 +#endif + +#define HAVE_LIBDL 1 + +/* damage containment */ + +#define DARWIN 1 + +/* other configured variables */ + +#if SPURVM +# define VM_VERSION "5.0" +#else +# define VM_VERSION "4.5" +#endif +#define VM_MODULE_PREFIX "" +/* #undef VM_DLSYM_PREFIX */ +#define VM_X11DIR "/usr/X11R6/lib" + +/* avoid dependencies on glibc2.3 */ + +/* #undef HAVE_FEATURES_H */ + +#if defined(HAVE_FEATURES_H) +# include "glibc.h" +#endif + +#endif /* __sq_config_h */ Modified: branches/Cog/platforms/iOS/vm/iPhone/config.h =================================================================== --- branches/Cog/platforms/iOS/vm/iPhone/config.h 2015-01-07 18:50:12 UTC (rev 3217) +++ branches/Cog/platforms/iOS/vm/iPhone/config.h 2015-01-07 19:23:24 UTC (rev 3218) @@ -35,10 +35,6 @@ #ifndef __sq_config_h #define __sq_config_h -/* explicit image width */ - -#define HAVE_INTERP_H 1 - /* package options */ #define USE_X11 1 @@ -97,8 +93,6 @@ /* #undef HAVE_GL_GL_H */ #define HAVE_OPENGL_GL_H 1 -/* #undef NEED_SUNOS_H */ - /* system calls/library functions */ #define AT_EXIT atexit @@ -170,22 +164,19 @@ #endif #define HAVE_LIBDL 1 -/* #undef DOUBLE_WORD_ALIGNMENT */ /* #undef DOUBLE_WORD_ORDER */ /* damage containment */ #define DARWIN 1 -#ifdef NEED_SUNOS_H -# include "sunos.h" -#endif - /* other configured variables */ -#define SQ_VERSION "3.8g-6548" -#define VM_VERSION "3.8a-2" -#define VM_LIBDIR "/usr/local/lib/squeak/3.8a-2" +#if SPURVM +# define VM_VERSION "5.0" +#else +# define VM_VERSION "4.5" +#endif #define VM_MODULE_PREFIX "" /* #undef VM_DLSYM_PREFIX */ #define VM_X11DIR "/usr/X11R6/lib" Modified: branches/Cog/platforms/win32/vm/config.h =================================================================== --- branches/Cog/platforms/win32/vm/config.h 2015-01-07 18:50:12 UTC (rev 3217) +++ branches/Cog/platforms/win32/vm/config.h 2015-01-07 19:23:24 UTC (rev 3218) @@ -1,3 +1,2 @@ -#define HAVE_INTERP_H #define SIZEOF_VOID_P 4 - +#define SIZEOF_LONG_LONG 8

1 0

← Newer
1
...
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2015