Index: branches/slice/i386/libsaio/cpu.c =================================================================== --- branches/slice/i386/libsaio/cpu.c (revision 680) +++ branches/slice/i386/libsaio/cpu.c (revision 681) @@ -10,7 +10,7 @@ #include "cpu.h" #ifndef DEBUG_CPU -#define DEBUG_CPU 0 +#define DEBUG_CPU 1 #endif #if DEBUG_CPU @@ -98,7 +98,7 @@ PlatformInfo_t *p = Platform; int i = 0; uint64_t tscFrequency, fsbFrequency, cpuFrequency; - uint64_t msr, flex_ratio; + uint64_t msr; //, flex_ratio; uint8_t maxcoef, maxdiv, currcoef, currdiv, mindiv; maxcoef = maxdiv = currcoef = currdiv = mindiv = 0; @@ -200,7 +200,7 @@ DBG("msr(0x%04x): platform_info %08x-%08x\n", MSR_PLATFORM_INFO, (msr >> 32) & 0xffffffff, msr & 0xffffffff); mindiv = (msr >> 40) & 0xff; - flex_ratio = (msr >> 8) & 0xff; + maxcoef = (msr >> 8) & 0xff; //Slice - doesn't work /* msr = rdmsr64(MSR_FLEX_RATIO); @@ -215,9 +215,11 @@ if (msr) { currcoef = msr & 0x1f; } - if (currcoef < flex_ratio) { - currcoef = flex_ratio; + + if (!currcoef) { + currcoef = maxcoef; } + if (currcoef < mindiv) { currcoef = mindiv; } @@ -230,8 +232,6 @@ else //not nehalem { //Slice - it is not FSB frequency. It is System Bus Speed: FSB = SBS * 4; - //crash with i7? -#if 1 //NOTI7 if (p->CPU.Family != 0x0d){ msr = rdmsr64(MSR_FSB_FREQ); switch (msr & 7) { @@ -262,14 +262,18 @@ } DBG("msr(0x%04x): MSR_FSB_FREQ %dMHz\n", MSR_FSB_FREQ, fsbFrequency/MEGA); } -#endif msr = rdmsr64(MSR_PLATFORM_INFO); - uint32_t m2 = msr & 0xffffffff; + uint32_t m2 = msr >> 32; DBG("msr(0x%04x): platform_info %08x-%08x\n", MSR_PLATFORM_INFO, - (msr >> 32) & 0xffffffff, m2); - currcoef = (msr >> 40) & 0xff; + m2 & 0xffffffff, msr & 0xffffffff); + msr = rdmsr64(MSR_IA32_PERF_STATUS); + m2 = msr >> 32; + DBG("msr(0x%04x): MSR_IA32_PERF_STATUS %08x-%08x\n", MSR_IA32_PERF_STATUS, + m2 & 0xffffffff, msr & 0xffffffff); + + currcoef = (msr >> 8) & 0x1f; mindiv = (msr >> 24) & 0xf; if (currcoef < mindiv) { currcoef = mindiv; @@ -462,7 +466,7 @@ msglog("CPU: fsb=0 ! using the default value 100MHz !\n"); } - +/* p->CPU.Vendor = p->CPU.CPUID[CPUID_0][1]; p->CPU.Signature = p->CPU.CPUID[CPUID_1][0]; p->CPU.Stepping = bitfield(p->CPU.CPUID[CPUID_1][0], 3, 0); @@ -471,7 +475,7 @@ p->CPU.ExtModel = bitfield(p->CPU.CPUID[CPUID_1][0], 19, 16); p->CPU.ExtFamily = bitfield(p->CPU.CPUID[CPUID_1][0], 27, 20); p->CPU.NoThreads = bitfield(p->CPU.CPUID[CPUID_1][1], 23, 16); - +*/ p->CPU.MaxCoef = maxcoef; Index: branches/slice/i386/libsaio/platform.h =================================================================== --- branches/slice/i386/libsaio/platform.h (revision 680) +++ branches/slice/i386/libsaio/platform.h (revision 681) @@ -128,11 +128,11 @@ uint32_t NoCores; // No Cores per Package uint32_t NoThreads; // Threads per Package uint8_t MaxCoef; // Max Multiplier - uint8_t MaxDiv; - uint8_t MinCoef; + uint8_t MaxDiv; // Possible 0,5 + uint8_t MinCoef; // Min Multiplier uint8_t CurrCoef; // Current Multiplier uint8_t CurrDiv; - float MaxRatio; + float MaxRatio; // non-integer ratio float CurrRatio; uint64_t TSCFrequency; // TSC Frequency Hz uint64_t FSBFrequency; // FSB Frequency Hz Index: branches/slice/i386/boot2/boot.c =================================================================== --- branches/slice/i386/boot2/boot.c (revision 680) +++ branches/slice/i386/boot2/boot.c (revision 681) @@ -91,7 +91,7 @@ BVRef bvChain; //static void selectBiosDevice(void); -static unsigned long Adler32(unsigned char *buffer, long length); +//static unsigned long Adler32(unsigned char *buffer, long length); static bool getOSVersion(char *str); #ifndef OPTION_ROM @@ -547,12 +547,12 @@ } else { if(gMacOSVersion[3] == '6') sprintf(gBootKernelCacheFile, "%s_%s.%08lX", kDefaultCachePathSnow, (archCpuType == CPU_TYPE_I386) ? "i386" : "x86_64", adler32); - else if(gMacOSVersion[3] == '5') + else //if(gMacOSVersion[3] == '5') sprintf(gBootKernelCacheFile, "%s", kDefaultCachePath); - else - sprintf(gBootKernelCacheFile, "%s", kDefaultCachePathTiger); +// else +// sprintf(gBootKernelCacheFile, "%s", kDefaultCachePathTiger); } - verbose("Try cache %s\n", gBootKernelCacheFile); + msglog("Try cache %s\n", gBootKernelCacheFile); // Check for cache file. trycache = (((gBootMode & kBootModeSafe) == 0) && !gOverrideKernel && @@ -733,7 +733,7 @@ #define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); #define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); #define DO16(buf) DO8(buf,0); DO8(buf,8); - +/* unsigned long Adler32(unsigned char *buf, long len) { unsigned long s1 = 1; // adler & 0xffff; @@ -759,3 +759,4 @@ result = (s2 << 16) | s1; return OSSwapHostToBigInt32(result); } +*/ \ No newline at end of file Index: branches/slice/i386/boot2/modules.c =================================================================== --- branches/slice/i386/boot2/modules.c (revision 680) +++ branches/slice/i386/boot2/modules.c (revision 681) @@ -840,8 +840,8 @@ case BIND_OPCODE_SET_DYLIB_SPECIAL_IMM: // NOTE: this is wrong, fortunately we don't use it - libraryOrdinal = -immediate; - //DBG("BIND_OPCODE_SET_DYLIB_SPECIAL_IMM: %d\n", libraryOrdinal); + libraryOrdinal = immediate ? (SInt8)(BIND_OPCODE_MASK | immediate) : immediate; + //printf("BIND_OPCODE_SET_DYLIB_SPECIAL_IMM: %d\n", libraryOrdinal); break; @@ -927,6 +927,15 @@ case BIND_OPCODE_DO_BIND: //DBG("BIND_OPCODE_DO_BIND\n"); + if(libraryOrdinal == BIND_SPECIAL_DYLIB_FLAT_LOOKUP && type == BIND_TYPE_POINTER) + { + // HACK(ish) + // Internal symbol, don't bind + } + else + { + //printf("Binding symbol %s, libraryOrdinal = %d, symboFlags = %d, type = %d\n", symbolName, libraryOrdinal, symboFlags, type); + if(symbolAddr != 0xFFFFFFFF) { address = segmentAddress + (UInt32)base; @@ -935,9 +944,10 @@ } else //if(strcmp(symbolName, SYMBOL_DYLD_STUB_BINDER) != 0) { - printf("Unable to bind symbol %s\n", symbolName); + printf("Unable to bind symbol %s, libraryOrdinal = %d, symboFlags = %d, type = %d\n", symbolName, libraryOrdinal, symboFlags, type); getc(); } + } segmentAddress += sizeof(void*); break; @@ -957,7 +967,12 @@ while(bind_stream[i] & 0x80); - + if(libraryOrdinal == BIND_SPECIAL_DYLIB_FLAT_LOOKUP && type == BIND_TYPE_POINTER) + { + // Internal symbol, don't bind + } + else + { if(symbolAddr != 0xFFFFFFFF) { address = segmentAddress + (UInt32)base; @@ -969,6 +984,7 @@ printf("Unable to bind symbol %s\n", symbolName); getc(); } + } segmentAddress += tmp + sizeof(void*); @@ -976,7 +992,12 @@ case BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED: //DBG("BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED\n"); - + if(libraryOrdinal == BIND_SPECIAL_DYLIB_FLAT_LOOKUP && type == BIND_TYPE_POINTER) + { + // Internal symbol, don't bind + } + else + { if(symbolAddr != 0xFFFFFFFF) { address = segmentAddress + (UInt32)base; @@ -988,6 +1009,7 @@ printf("Unable to bind symbol %s\n", symbolName); getc(); } + } segmentAddress += (immediate * sizeof(void*)) + sizeof(void*); @@ -1024,17 +1046,30 @@ { address = segmentAddress + (UInt32)base; + if(libraryOrdinal == BIND_SPECIAL_DYLIB_FLAT_LOOKUP && type == BIND_TYPE_POINTER) + { + // Internal symbol, don't bind + } + else + { bind_location((UInt32*)address, (char*)symbolAddr, addend, BIND_TYPE_POINTER); - + } segmentAddress += tmp2 + sizeof(void*); } } - else //if(strcmp(symbolName, SYMBOL_DYLD_STUB_BINDER) != 0) + else { + if(libraryOrdinal == BIND_SPECIAL_DYLIB_FLAT_LOOKUP && type == BIND_TYPE_POINTER) + { + // Internal symbol, don't bind + } + else + { printf("Unable to bind symbol %s\n", symbolName); getc(); } + } break; @@ -1172,17 +1207,6 @@ unsigned int lookup_all_symbols(const char* name) { unsigned int addr = 0xFFFFFFFF; - if(lookup_symbol && (UInt32)lookup_symbol != 0xFFFFFFFF) - { - addr = lookup_symbol(name); - if(addr != 0xFFFFFFFF) - { - //DBG("Internal symbol %s located at 0x%X\n", name, addr); - return addr; - } - } - - symbolList_t* entry = moduleSymbols; while(entry) { @@ -1197,12 +1221,21 @@ } } + + if(lookup_symbol && (UInt32)lookup_symbol != 0xFFFFFFFF) + { + addr = lookup_symbol(name); + if(addr != 0xFFFFFFFF) + { + //DBG("Internal symbol %s located at 0x%X\n", name, addr); + return addr; + } + } + + #if DEBUG_MODULES -// if(strcmp(name, SYMBOL_DYLD_STUB_BINDER) != 0) -// { verbose("Unable to locate symbol %s\n", name); getc(); -// } #endif return 0xFFFFFFFF; } @@ -1305,40 +1338,4 @@ { // TODO: actualy impliment this function (asm) stop("ERROR: dyld_stub_binder was called, should have been take care of by the linker.\n"); -} - -/* Nedded to divide 64bit numbers correctly. TODO: look into why modules need this - * And why it isn't needed when compiled into boot2 - */ - -uint64_t __udivdi3(uint64_t numerator, uint64_t denominator) -{ - uint64_t quotient = 0, qbit = 1; - - if (denominator) - { - while ((int64_t) denominator >= 0) - { - denominator <<= 1; - qbit <<= 1; - } - - while (denominator) - { - if (denominator <= numerator) - { - numerator -= denominator; - quotient += qbit; - } - denominator >>= 1; - qbit >>= 1; - } - - return quotient; - } - else { - stop("Divide by 0"); - return 0; - } - -} +} \ No newline at end of file Index: branches/slice/i386/boot2/boot.h =================================================================== --- branches/slice/i386/boot2/boot.h (revision 680) +++ branches/slice/i386/boot2/boot.h (revision 681) @@ -213,6 +213,7 @@ allows other code to cause additional drivers to be loaded. */ extern long (*LoadExtraDrivers_p)(FileLoadDrivers_t FileLoadDrivers_p); +extern unsigned long Adler32( unsigned char * buffer, long length ); /* * options.c Index: branches/slice/i386/boot2/drivers.c =================================================================== --- branches/slice/i386/boot2/drivers.c (revision 680) +++ branches/slice/i386/boot2/drivers.c (revision 681) @@ -47,7 +47,7 @@ long (*LoadExtraDrivers_p)(FileLoadDrivers_t FileLoadDrivers_p); #endif -unsigned long Mkext_Alder32( unsigned char * buffer, long length ); +//extern unsigned long Adler32( unsigned char * buffer, long length ); long FileLoadDrivers(char *dirSpec, long plugin); #ifndef OPTION_ROM @@ -74,7 +74,7 @@ char * gFileName; unsigned long -Mkext_Alder32( unsigned char * buffer, long length ) +Adler32( unsigned char * buffer, long length ) { long cnt; unsigned long result, lowHalf, highHalf; @@ -386,7 +386,7 @@ ( GetPackageElement(signature2) != kDriverPackageSignature2) || ( GetPackageElement(length) > kLoadSize ) || ( GetPackageElement(alder32) != - Mkext_Alder32((unsigned char *)&package->version, GetPackageElement(length) - 0x10) ) ) + Adler32((unsigned char *)&package->version, GetPackageElement(length) - 0x10) ) ) { return -1; } @@ -786,7 +786,7 @@ return -1; } if (OSSwapBigToHostInt32(kernel_header->adler32) != - Mkext_Alder32(binary, uncompressed_size)) { + Adler32(binary, uncompressed_size)) { printf("adler mismatch\n"); return -1; } Index: branches/slice/i386/modules/KextPatcher/kext_patcher.c =================================================================== --- branches/slice/i386/modules/KextPatcher/kext_patcher.c (revision 680) +++ branches/slice/i386/modules/KextPatcher/kext_patcher.c (revision 681) @@ -89,7 +89,7 @@ } -unsigned long Mkext_Alder32( unsigned char * buffer, long length ); +//unsigned long Adler32( unsigned char * buffer, long length ); void KextPatcher_hook(void* current, void* arg2, void* arg3, void* arg4); @@ -161,8 +161,9 @@ ( MKEXT_GET_SIGNATURE(package) != MKEXT_SIGN ) || ( MKEXT_GET_LENGTH(package) > kLoadSize ) || ( MKEXT_GET_CHECKSUM(package) != - Mkext_Alder32((unsigned char *)&package->version, MKEXT_GET_LENGTH(package) - 0x10) ) ) + Adler32((unsigned char *)&package->version, MKEXT_GET_LENGTH(package) - 0x10) ) ) { + msglog("mkext verification failed, do not patch\n"); return; // Don't try to patch a b } @@ -319,7 +320,7 @@ // re alder32 the new mkext2 package MKEXT_HDR_CAST(package)->adler32 = - MKEXT_SWAP(Mkext_Alder32((unsigned char *)&package->version, + MKEXT_SWAP(Adler32((unsigned char *)&package->version, MKEXT_GET_LENGTH(package) - 0x10)); } } Index: branches/slice/i386/modules/NVRAM/NVRAM.c =================================================================== --- branches/slice/i386/modules/NVRAM/NVRAM.c (revision 680) +++ branches/slice/i386/modules/NVRAM/NVRAM.c (revision 681) @@ -65,9 +65,9 @@ char* bnName; EFI_GUID* ret = 0; uint16_t bootOptionNumber = 0; - msglog("NVRAM is not implemented yet\n"); +// msglog("NVRAM is not implemented yet\n"); - return; +// return; msglog("NVRAM started\n"); Index: branches/slice/i386/modules/GraphicsEnabler/nvidia.c =================================================================== --- branches/slice/i386/modules/GraphicsEnabler/nvidia.c (revision 680) +++ branches/slice/i386/modules/GraphicsEnabler/nvidia.c (revision 681) @@ -374,7 +374,6 @@ { 0x10DE06C4, "GeForce GTX 465" }, { 0x10DE06CA, "GeForce GTX 480M" }, { 0x10DE06CD, "GeForce GTX 470" }, - { 0x10DE06DD, "Quadro 4000" }, { 0x10DE06D1, "Tesla C2050" }, // TODO: sub-device id: 0x0771 { 0x10DE06D1, "Tesla C2070" }, // TODO: sub-device id: 0x0772 { 0x10DE06D2, "Tesla M2070" }, @@ -472,7 +471,7 @@ { 0x10DE1082, "D13U" }, { 0x10DE1083, "D13U" }, { 0x10DE1098, "D13U" }, - { 0x10DE109A, "N12E-Q5" }, + { 0x10DE109A, "N12E-Q5" } }; static uint16_t swap16(uint16_t x) @@ -834,7 +833,7 @@ devicepath); rom = malloc(NVIDIA_ROM_SIZE); - sprintf(nvFilename, "/Extra/%04x_%04x.rom", (uint16_t)nvda_dev->vendor_id, (uint16_t)nvda_dev->device_id); + sprintf(nvFilename, "bt(0,0)/Extra/%04x_%04x.rom", (uint16_t)nvda_dev->vendor_id, (uint16_t)nvda_dev->device_id); if (getBoolForKey(kUseNvidiaROM, &doit, &bootInfo->bootConfig) && doit) { verbose("Looking for nvidia video bios file %s\n", nvFilename); nvBiosOveride = load_nvidia_bios_file(nvFilename, rom, NVIDIA_ROM_SIZE); Index: branches/slice/revision =================================================================== --- branches/slice/revision (revision 680) +++ branches/slice/revision (revision 681) @@ -1 +1 @@ -673 \ No newline at end of file +676:678 \ No newline at end of file Index: branches/slice/ChamMek/ChamMek.xcodeproj/slice.pbxuser =================================================================== --- branches/slice/ChamMek/ChamMek.xcodeproj/slice.pbxuser (revision 680) +++ branches/slice/ChamMek/ChamMek.xcodeproj/slice.pbxuser (revision 681) @@ -48,63 +48,78 @@ PBXFileDataSource_Target_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 314278898; - PBXWorkspaceStateSaveDate = 314278898; + PBXConfiguration.PBXFileTableDataSource3.PBXFindDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXFindDataSource_LocationID; + PBXFileTableDataSourceColumnWidthsKey = ( + 200, + 739, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXFindDataSource_MessageID, + PBXFindDataSource_LocationID, + ); + }; + PBXPerProjectTemplateStateSaveDate = 314481806; + PBXWorkspaceStateSaveDate = 314481806; }; perUserProjectItems = { - 120DFB1712BA3A4D00C7EAC8 = 120DFB1712BA3A4D00C7EAC8 /* PBXTextBookmark */; - 120DFB1812BA3A4D00C7EAC8 = 120DFB1812BA3A4D00C7EAC8 /* PBXTextBookmark */; - 120DFF6B12BA3BF500C7EAC8 = 120DFF6B12BA3BF500C7EAC8 /* PBXTextBookmark */; - 12121ED112B261EA00207E55 = 12121ED112B261EA00207E55 /* PBXTextBookmark */; - 1216139E12B65BB50019961E = 1216139E12B65BB50019961E /* PBXTextBookmark */; - 121613FF12B65D970019961E = 121613FF12B65D970019961E /* PBXTextBookmark */; - 124C493212B8D846005AA276 = 124C493212B8D846005AA276 /* PBXTextBookmark */; - 124C493712B8D846005AA276 = 124C493712B8D846005AA276 /* PBXTextBookmark */; - 124C494212B8E8C2005AA276 = 124C494212B8E8C2005AA276 /* PBXTextBookmark */; - 124C494312B8E8C2005AA276 = 124C494312B8E8C2005AA276 /* PBXTextBookmark */; - 124C494512B8E8C2005AA276 = 124C494512B8E8C2005AA276 /* PBXTextBookmark */; - 124C494B12B8EA5D005AA276 = 124C494B12B8EA5D005AA276 /* PBXTextBookmark */; - 1267813012B7B13E00A25CED = 1267813012B7B13E00A25CED /* PBXTextBookmark */; - 1299A51F12B3C328007ED516 = 1299A51F12B3C328007ED516 /* PBXTextBookmark */; - 1299A55612B3C4DF007ED516 = 1299A55612B3C4DF007ED516 /* PBXTextBookmark */; - 12AB04BD12B663F5005A745F = 12AB04BD12B663F5005A745F /* PBXTextBookmark */; - 12AB04EC12B665EA005A745F = 12AB04EC12B665EA005A745F /* PBXTextBookmark */; - 12AF764312BA614B003BBFD3 = 12AF764312BA614B003BBFD3 /* PBXTextBookmark */; - 12B46E6612B75631006C2B9C = 12B46E6612B75631006C2B9C /* PBXTextBookmark */; - 12B46E6812B75631006C2B9C = 12B46E6812B75631006C2B9C /* PBXTextBookmark */; - 12B46E6912B75631006C2B9C = 12B46E6912B75631006C2B9C /* PBXTextBookmark */; - 12B46E6A12B75631006C2B9C = 12B46E6A12B75631006C2B9C /* PBXTextBookmark */; - 12B90A2012B2A7E200FE287A = 12B90A2012B2A7E200FE287A /* PBXTextBookmark */; - 12B90A2B12B2A86B00FE287A = 12B90A2B12B2A86B00FE287A /* PBXTextBookmark */; - 12B90A4D12B2AE1300FE287A = 12B90A4D12B2AE1300FE287A /* PBXTextBookmark */; - 12B90A4F12B2AE1300FE287A = 12B90A4F12B2AE1300FE287A /* PBXTextBookmark */; - 12B90A5212B2AE1300FE287A = 12B90A5212B2AE1300FE287A /* PBXTextBookmark */; - 12B9F42612B29A4A00FE287A = 12B9F42612B29A4A00FE287A /* PBXTextBookmark */; - 12BF14DA12B3CF8E00D798FE = 12BF14DA12B3CF8E00D798FE /* PBXTextBookmark */; - 12C7009812B7BCE7006BD382 = 12C7009812B7BCE7006BD382 /* PBXTextBookmark */; - 12C7009912B7BCE7006BD382 = 12C7009912B7BCE7006BD382 /* PBXTextBookmark */; - 12C704E512B7BD3E006BD382 = 12C704E512B7BD3E006BD382 /* PBXTextBookmark */; - 12C7FC4D12B7BCD3006BD382 = 12C7FC4D12B7BCD3006BD382 /* PBXTextBookmark */; - 12C7FC4E12B7BCD3006BD382 = 12C7FC4E12B7BCD3006BD382 /* PlistBookmark */; - 12C8CB6812B5529D003DA1E4 = 12C8CB6812B5529D003DA1E4 /* PBXTextBookmark */; - 12CC44C812B3947B007E0C76 = 12CC44C812B3947B007E0C76 /* PBXTextBookmark */; - 12D6232512BA5F380032F367 = 12D6232512BA5F380032F367 /* PBXTextBookmark */; - 12D6232612BA5F380032F367 = 12D6232612BA5F380032F367 /* PBXTextBookmark */; - 12E17AE612B2BA9B00607D8E = 12E17AE612B2BA9B00607D8E /* PBXTextBookmark */; - 12E6FB5712BB458400C2A021 = 12E6FB5712BB458400C2A021 /* PBXTextBookmark */; - 12EFD98A12B510D9002A1712 = 12EFD98A12B510D9002A1712 /* PBXTextBookmark */; - 12EFE2FD12B51ED5002A1712 = 12EFE2FD12B51ED5002A1712 /* PBXTextBookmark */; - 12EFE65A12B547A7002A1712 = 12EFE65A12B547A7002A1712 /* PBXTextBookmark */; - 12EFE95E12B549B6002A1712 = 12EFE95E12B549B6002A1712 /* PBXTextBookmark */; - 12FC0E7512BB4B5200E9CFA8 = 12FC0E7512BB4B5200E9CFA8 /* PBXTextBookmark */; - 12FC0E9412BB65A800E9CFA8 = 12FC0E9412BB65A800E9CFA8 /* PBXTextBookmark */; - 12FC14AE12BB730100E9CFA8 = 12FC14AE12BB730100E9CFA8 /* PBXTextBookmark */; - 12FC25E712BB825300E9CFA8 = 12FC25E712BB825300E9CFA8 /* PBXTextBookmark */; - 12FC291212BB848E00E9CFA8 /* PBXTextBookmark */ = 12FC291212BB848E00E9CFA8 /* PBXTextBookmark */; - 12FC291412BB848E00E9CFA8 /* PBXTextBookmark */ = 12FC291412BB848E00E9CFA8 /* PBXTextBookmark */; - 12FC291612BB848E00E9CFA8 /* PBXTextBookmark */ = 12FC291612BB848E00E9CFA8 /* PBXTextBookmark */; - 12FC291812BB848E00E9CFA8 /* PBXTextBookmark */ = 12FC291812BB848E00E9CFA8 /* PBXTextBookmark */; - 12FC291F12BB84B200E9CFA8 /* PBXTextBookmark */ = 12FC291F12BB84B200E9CFA8 /* PBXTextBookmark */; + 120DFB1712BA3A4D00C7EAC8 /* PBXTextBookmark */ = 120DFB1712BA3A4D00C7EAC8 /* PBXTextBookmark */; + 120DFB1812BA3A4D00C7EAC8 /* PBXTextBookmark */ = 120DFB1812BA3A4D00C7EAC8 /* PBXTextBookmark */; + 120DFF6B12BA3BF500C7EAC8 /* PBXTextBookmark */ = 120DFF6B12BA3BF500C7EAC8 /* PBXTextBookmark */; + 12121ED112B261EA00207E55 /* PBXTextBookmark */ = 12121ED112B261EA00207E55 /* PBXTextBookmark */; + 1216139E12B65BB50019961E /* PBXTextBookmark */ = 1216139E12B65BB50019961E /* PBXTextBookmark */; + 121613FF12B65D970019961E /* PBXTextBookmark */ = 121613FF12B65D970019961E /* PBXTextBookmark */; + 1236A82312BD6023003F1DA9 /* PBXTextBookmark */ = 1236A82312BD6023003F1DA9 /* PBXTextBookmark */; + 124C493212B8D846005AA276 /* PBXTextBookmark */ = 124C493212B8D846005AA276 /* PBXTextBookmark */; + 124C493712B8D846005AA276 /* PBXTextBookmark */ = 124C493712B8D846005AA276 /* PBXTextBookmark */; + 124C494212B8E8C2005AA276 /* PBXTextBookmark */ = 124C494212B8E8C2005AA276 /* PBXTextBookmark */; + 124C494312B8E8C2005AA276 /* PBXTextBookmark */ = 124C494312B8E8C2005AA276 /* PBXTextBookmark */; + 124C494512B8E8C2005AA276 /* PBXTextBookmark */ = 124C494512B8E8C2005AA276 /* PBXTextBookmark */; + 124C494B12B8EA5D005AA276 /* PBXTextBookmark */ = 124C494B12B8EA5D005AA276 /* PBXTextBookmark */; + 1267813012B7B13E00A25CED /* PBXTextBookmark */ = 1267813012B7B13E00A25CED /* PBXTextBookmark */; + 12679BA312BE822E00E3637F /* PBXTextBookmark */ = 12679BA312BE822E00E3637F /* PBXTextBookmark */; + 1269260612BC99AD004D09F1 /* PBXTextBookmark */ = 1269260612BC99AD004D09F1 /* PBXTextBookmark */; + 1299583012BEA42800C307EC /* PBXTextBookmark */ = 1299583012BEA42800C307EC /* PBXTextBookmark */; + 1299583112BEA42800C307EC /* PBXTextBookmark */ = 1299583112BEA42800C307EC /* PBXTextBookmark */; + 1299583312BEA42800C307EC /* PBXTextBookmark */ = 1299583312BEA42800C307EC /* PBXTextBookmark */; + 1299A51F12B3C328007ED516 /* PBXTextBookmark */ = 1299A51F12B3C328007ED516 /* PBXTextBookmark */; + 1299A55612B3C4DF007ED516 /* PBXTextBookmark */ = 1299A55612B3C4DF007ED516 /* PBXTextBookmark */; + 12AB04BD12B663F5005A745F /* PBXTextBookmark */ = 12AB04BD12B663F5005A745F /* PBXTextBookmark */; + 12AB04EC12B665EA005A745F /* PBXTextBookmark */ = 12AB04EC12B665EA005A745F /* PBXTextBookmark */; + 12AF764312BA614B003BBFD3 /* PBXTextBookmark */ = 12AF764312BA614B003BBFD3 /* PBXTextBookmark */; + 12B46E6612B75631006C2B9C /* PBXTextBookmark */ = 12B46E6612B75631006C2B9C /* PBXTextBookmark */; + 12B46E6812B75631006C2B9C /* PBXTextBookmark */ = 12B46E6812B75631006C2B9C /* PBXTextBookmark */; + 12B46E6912B75631006C2B9C /* PBXTextBookmark */ = 12B46E6912B75631006C2B9C /* PBXTextBookmark */; + 12B46E6A12B75631006C2B9C /* PBXTextBookmark */ = 12B46E6A12B75631006C2B9C /* PBXTextBookmark */; + 12B90A2012B2A7E200FE287A /* PBXTextBookmark */ = 12B90A2012B2A7E200FE287A /* PBXTextBookmark */; + 12B90A2B12B2A86B00FE287A /* PBXTextBookmark */ = 12B90A2B12B2A86B00FE287A /* PBXTextBookmark */; + 12B90A4D12B2AE1300FE287A /* PBXTextBookmark */ = 12B90A4D12B2AE1300FE287A /* PBXTextBookmark */; + 12B90A4F12B2AE1300FE287A /* PBXTextBookmark */ = 12B90A4F12B2AE1300FE287A /* PBXTextBookmark */; + 12B90A5212B2AE1300FE287A /* PBXTextBookmark */ = 12B90A5212B2AE1300FE287A /* PBXTextBookmark */; + 12B9F42612B29A4A00FE287A /* PBXTextBookmark */ = 12B9F42612B29A4A00FE287A /* PBXTextBookmark */; + 12BB721512BE659500B11948 /* PBXTextBookmark */ = 12BB721512BE659500B11948 /* PBXTextBookmark */; + 12BF14DA12B3CF8E00D798FE /* PBXTextBookmark */ = 12BF14DA12B3CF8E00D798FE /* PBXTextBookmark */; + 12C7009812B7BCE7006BD382 /* PBXTextBookmark */ = 12C7009812B7BCE7006BD382 /* PBXTextBookmark */; + 12C7009912B7BCE7006BD382 /* PBXTextBookmark */ = 12C7009912B7BCE7006BD382 /* PBXTextBookmark */; + 12C704E512B7BD3E006BD382 /* PBXTextBookmark */ = 12C704E512B7BD3E006BD382 /* PBXTextBookmark */; + 12C7FC4D12B7BCD3006BD382 /* PBXTextBookmark */ = 12C7FC4D12B7BCD3006BD382 /* PBXTextBookmark */; + 12C7FC4E12B7BCD3006BD382 /* PlistBookmark */ = 12C7FC4E12B7BCD3006BD382 /* PlistBookmark */; + 12C8CB6812B5529D003DA1E4 /* PBXTextBookmark */ = 12C8CB6812B5529D003DA1E4 /* PBXTextBookmark */; + 12CC44C812B3947B007E0C76 /* PBXTextBookmark */ = 12CC44C812B3947B007E0C76 /* PBXTextBookmark */; + 12D6232512BA5F380032F367 /* PBXTextBookmark */ = 12D6232512BA5F380032F367 /* PBXTextBookmark */; + 12D6232612BA5F380032F367 /* PBXTextBookmark */ = 12D6232612BA5F380032F367 /* PBXTextBookmark */; + 12DCD38E12BBA5D600A20635 /* PBXTextBookmark */ = 12DCD38E12BBA5D600A20635 /* PBXTextBookmark */; + 12DCD38F12BBA5D600A20635 /* PBXTextBookmark */ = 12DCD38F12BBA5D600A20635 /* PBXTextBookmark */; + 12E17AE612B2BA9B00607D8E /* PBXTextBookmark */ = 12E17AE612B2BA9B00607D8E /* PBXTextBookmark */; + 12E6FB5712BB458400C2A021 /* PBXTextBookmark */ = 12E6FB5712BB458400C2A021 /* PBXTextBookmark */; + 12EFD98A12B510D9002A1712 /* PBXTextBookmark */ = 12EFD98A12B510D9002A1712 /* PBXTextBookmark */; + 12EFE2FD12B51ED5002A1712 /* PBXTextBookmark */ = 12EFE2FD12B51ED5002A1712 /* PBXTextBookmark */; + 12EFE65A12B547A7002A1712 /* PBXTextBookmark */ = 12EFE65A12B547A7002A1712 /* PBXTextBookmark */; + 12EFE95E12B549B6002A1712 /* PBXTextBookmark */ = 12EFE95E12B549B6002A1712 /* PBXTextBookmark */; + 12F7FF0012BB9F3200949DEC /* PBXTextBookmark */ = 12F7FF0012BB9F3200949DEC /* PBXTextBookmark */; + 12FC0E7512BB4B5200E9CFA8 /* PBXTextBookmark */ = 12FC0E7512BB4B5200E9CFA8 /* PBXTextBookmark */; + 12FC0E9412BB65A800E9CFA8 /* PBXTextBookmark */ = 12FC0E9412BB65A800E9CFA8 /* PBXTextBookmark */; }; sourceControlManager = 12C26D3712B0DDFC00AF7F4B /* Source Control */; userBuildSettings = { @@ -212,6 +227,23 @@ path = /Users/slice/Projects/fakesmc/Chameleon/RC5m/i386/libsaio/smbios_patcher.c; sourceTree = ""; }; + 1236A82312BD6023003F1DA9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1269260B12BC9B1B004D09F1 /* acpi_patcher.c */; + name = "acpi_patcher.c: 137"; + rLen = 6; + rLoc = 3329; + rType = 0; + vrLen = 588; + vrLoc = 2933; + }; + 1236A82C12BD6023003F1DA9 /* gui.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = gui.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/GUI/gui.c; + sourceTree = ""; + }; 124C492812B8C915005AA276 /* Memory.c */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; @@ -324,6 +356,85 @@ vrLen = 637; vrLoc = 0; }; + 12679BA312BE822E00E3637F /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 12BB721912BE659500B11948 /* nvidia.c */; + name = "nvidia.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 894; + vrLoc = 14871; + }; + 12679BA712BE822E00E3637F /* boot.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = boot.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/boot2/boot.c; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {903, 9698}}"; + sepNavSelRange = "{16367, 7}"; + sepNavVisRange = "{15853, 1136}"; + }; + }; + 1269260612BC99AD004D09F1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 12DCD39312BBA5D600A20635 /* NVRAM.c */; + name = "NVRAM.c: 147"; + rLen = 14; + rLoc = 4792; + rType = 0; + vrLen = 574; + vrLoc = 4564; + }; + 1269260B12BC9B1B004D09F1 /* acpi_patcher.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = acpi_patcher.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/ACPIPatcher/acpi_patcher.c; + sourceTree = ""; + }; + 1299583012BEA42800C307EC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 12679BA712BE822E00E3637F /* boot.c */; + name = "boot.c: 549"; + rLen = 7; + rLoc = 16367; + rType = 0; + vrLen = 1136; + vrLoc = 15853; + }; + 1299583112BEA42800C307EC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1299583212BEA42800C307EC /* cpu.c */; + rLen = 8; + rLoc = 4274; + rType = 0; + }; + 1299583212BEA42800C307EC /* cpu.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = cpu.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/cpu.c; + sourceTree = ""; + }; + 1299583312BEA42800C307EC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1299583412BEA42800C307EC /* cpu.c */; + name = "cpu.c: 133"; + rLen = 8; + rLoc = 4274; + rType = 0; + vrLen = 967; + vrLoc = 3935; + }; + 1299583412BEA42800C307EC /* cpu.c */ = { + isa = PBXFileReference; + name = cpu.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/cpu.c; + sourceTree = ""; + }; 1299A51F12B3C328007ED516 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 12CC4AEF12B39FC7007E0C76 /* zutil.h */; @@ -593,6 +704,23 @@ path = /Users/slice/Projects/fakesmc/Chameleon/RC5m/i386/modules/Memory/spd.c; sourceTree = ""; }; + 12BB721512BE659500B11948 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1236A82C12BD6023003F1DA9 /* gui.c */; + name = "gui.c: 728"; + rLen = 16; + rLoc = 22079; + rType = 0; + vrLen = 909; + vrLoc = 21674; + }; + 12BB721912BE659500B11948 /* nvidia.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = nvidia.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/GraphicsEnabler/nvidia.c; + sourceTree = ""; + }; 12BF14DA12B3CF8E00D798FE /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 1299A55A12B3C4DF007ED516 /* Symbols.c */; @@ -792,6 +920,40 @@ vrLen = 419; vrLoc = 398; }; + 12DCD38A12BBA53700A20635 /* modules.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = modules.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/boot2/modules.c; + sourceTree = ""; + }; + 12DCD38E12BBA5D600A20635 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 12F7FF0412BB9F3200949DEC /* ntfs_private.h */; + name = "ntfs_private.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1189; + vrLoc = 0; + }; + 12DCD38F12BBA5D600A20635 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 12DCD38A12BBA53700A20635 /* modules.c */; + name = "modules.c: 1274"; + rLen = 10; + rLoc = 29698; + rType = 0; + vrLen = 855; + vrLoc = 29322; + }; + 12DCD39312BBA5D600A20635 /* NVRAM.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = NVRAM.c; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/NVRAM/NVRAM.c; + sourceTree = ""; + }; 12E17AE612B2BA9B00607D8E /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 12B90A5712B2AE1300FE287A /* 915resolution.h */; @@ -908,6 +1070,23 @@ path = /Users/slice/Projects/fakesmc/Chameleon/RC5m/i386/libsaio/pci_root.c; sourceTree = ""; }; + 12F7FF0012BB9F3200949DEC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 12FC25E812BB825300E9CFA8 /* drivers.c */; + name = "drivers.c: 77"; + rLen = 13; + rLoc = 2379; + rType = 0; + vrLen = 570; + vrLoc = 2251; + }; + 12F7FF0412BB9F3200949DEC /* ntfs_private.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = ntfs_private.h; + path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/ntfs_private.h; + sourceTree = ""; + }; 12FC0E7512BB4B5200E9CFA8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 12E6FB5B12BB458400C2A021 /* load.c */; @@ -935,129 +1114,13 @@ vrLen = 362; vrLoc = 4873; }; - 12FC14AE12BB730100E9CFA8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 12FC14AF12BB730100E9CFA8 /* drivers.c */; - name = "drivers.c: 77"; - rLen = 8; - rLoc = 2385; - rType = 0; - vrLen = 456; - vrLoc = 2046; - }; - 12FC14AF12BB730100E9CFA8 /* drivers.c */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = drivers.c; - path = /Users/slice/Projects/fakesmc/Chameleon/RC5m/i386/boot2/drivers.c; - sourceTree = ""; - }; - 12FC25E712BB825300E9CFA8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 12FC25E812BB825300E9CFA8 /* drivers.c */; - name = "drivers.c: 77"; - rLen = 8; - rLoc = 2385; - rType = 0; - vrLen = 411; - vrLoc = 2046; - }; 12FC25E812BB825300E9CFA8 /* drivers.c */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = drivers.c; path = /Users/slice/Projects/fakesmc/Chameleon/RC5m/i386/boot2/drivers.c; sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {903, 10686}}"; - sepNavSelRange = "{2385, 8}"; - sepNavVisRange = "{2046, 386}"; - }; }; - 12FC291212BB848E00E9CFA8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 12FC291312BB848E00E9CFA8 /* Makefile */; - name = "Makefile: 33"; - rLen = 8; - rLoc = 650; - rType = 0; - vrLen = 792; - vrLoc = 320; - }; - 12FC291312BB848E00E9CFA8 /* Makefile */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.make; - name = Makefile; - path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/Makefile; - sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {903, 1794}}"; - sepNavSelRange = "{991, 1}"; - sepNavVisRange = "{942, 325}"; - }; - }; - 12FC291412BB848E00E9CFA8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 12FC291512BB848E00E9CFA8 /* buildpkg */; - name = "buildpkg: 288"; - rLen = 8; - rLoc = 10528; - rType = 0; - vrLen = 1412; - vrLoc = 9179; - }; - 12FC291512BB848E00E9CFA8 /* buildpkg */ = { - isa = PBXFileReference; - name = buildpkg; - path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/package/buildpkg; - sourceTree = ""; - }; - 12FC291612BB848E00E9CFA8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 12FC291712BB848E00E9CFA8 /* Makefile */; - rLen = 8; - rLoc = 4153; - rType = 0; - }; - 12FC291712BB848E00E9CFA8 /* Makefile */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.make; - name = Makefile; - path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/boot2/Makefile; - sourceTree = ""; - }; - 12FC291812BB848E00E9CFA8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 12FC291912BB848E00E9CFA8 /* Makefile */; - name = "Makefile: 117"; - rLen = 13; - rLoc = 4165; - rType = 0; - vrLen = 1365; - vrLoc = 3485; - }; - 12FC291912BB848E00E9CFA8 /* Makefile */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.make; - name = Makefile; - path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/boot2/Makefile; - sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1018, 2106}}"; - sepNavSelRange = "{4165, 13}"; - sepNavVisRange = "{3485, 1365}"; - }; - }; - 12FC291F12BB84B200E9CFA8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 12FC25E812BB825300E9CFA8 /* drivers.c */; - name = "drivers.c: 77"; - rLen = 8; - rLoc = 2385; - rType = 0; - vrLen = 386; - vrLoc = 2046; - }; 8DD76FA90486AB0100D96B5E /* ChamMek */ = { activeExec = 0; executables = ( Index: branches/slice/ChamMek/ChamMek.xcodeproj/slice.mode1v3 =================================================================== --- branches/slice/ChamMek/ChamMek.xcodeproj/slice.mode1v3 (revision 680) +++ branches/slice/ChamMek/ChamMek.xcodeproj/slice.mode1v3 (revision 681) @@ -274,9 +274,6 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 10 - 2 - 1 0 @@ -302,7 +299,7 @@ 164 RubberWindowFrame - 152 173 1172 694 0 0 1440 878 + 174 184 1172 694 0 0 1440 878 Module PBXSmartGroupTreeModule @@ -313,14 +310,12 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - drivers.c + cpu.c PBXSplitModuleInNavigatorKey Split0 @@ -328,11 +323,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - drivers.c + cpu.c _historyCapacity 0 bookmark - 12FC291F12BB84B200E9CFA8 + 1299583312BEA42800C307EC history 12121ED112B261EA00207E55 @@ -381,7 +376,15 @@ 12E6FB5712BB458400C2A021 12FC0E7512BB4B5200E9CFA8 12FC0E9412BB65A800E9CFA8 - 12FC25E712BB825300E9CFA8 + 12F7FF0012BB9F3200949DEC + 12DCD38E12BBA5D600A20635 + 12DCD38F12BBA5D600A20635 + 1269260612BC99AD004D09F1 + 1236A82312BD6023003F1DA9 + 12BB721512BE659500B11948 + 12679BA312BE822E00E3637F + 1299583012BEA42800C307EC + 1299583112BEA42800C307EC SplitCount @@ -393,16 +396,18 @@ GeometryConfiguration Frame - {{0, 0}, {964, 185}} + {{0, 0}, {964, 351}} RubberWindowFrame - 152 173 1172 694 0 0 1440 878 + 174 184 1172 694 0 0 1440 878 Module PBXNavigatorGroup Proportion - 185pt + 351pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -413,14 +418,14 @@ GeometryConfiguration Frame - {{0, 190}, {964, 463}} + {{0, 356}, {964, 297}} RubberWindowFrame - 152 173 1172 694 0 0 1440 878 + 174 184 1172 694 0 0 1440 878 Module XCDetailModule Proportion - 463pt + 297pt Proportion @@ -439,9 +444,9 @@ TableOfContents - 12FC292012BB84B200E9CFA8 + 1299583512BEA42800C307EC 1CE0B1FE06471DED0097A5F4 - 12FC292112BB84B200E9CFA8 + 1299583612BEA42800C307EC 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -584,7 +589,7 @@ /Users/slice/Projects/Chameleons/chameleon/branches/slice/ChamMek/ChamMek.xcodeproj WindowString - 152 173 1172 694 0 0 1440 878 + 174 184 1172 694 0 0 1440 878 WindowToolsV3 @@ -661,7 +666,7 @@ TableOfContents 12C26D3512B0DDFC00AF7F4B - 12FC291012BB848E00E9CFA8 + 1299582212BEA40900C307EC 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -783,13 +788,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 12FC0E7C12BB4B5200E9CFA8 + 1236A82512BD6023003F1DA9 1C162984064C10D400B95A72 - 12FC0E7D12BB4B5200E9CFA8 - 12FC0E7E12BB4B5200E9CFA8 - 12FC0E7F12BB4B5200E9CFA8 - 12FC0E8012BB4B5200E9CFA8 - 12FC0E8112BB4B5200E9CFA8 + 1236A82612BD6023003F1DA9 + 1236A82712BD6023003F1DA9 + 1236A82812BD6023003F1DA9 + 1236A82912BD6023003F1DA9 + 1236A82A12BD6023003F1DA9 ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -816,30 +821,32 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 1CDD528C0622207200134675 PBXProjectModuleLabel - <No Editor> + cpu.c StatusBarVisibility GeometryConfiguration Frame - {{0, 0}, {1079, 456}} + {{0, 0}, {1109, 510}} RubberWindowFrame - 297 75 1079 762 0 0 1440 878 + 254 61 1109 816 0 0 1440 878 Module PBXNavigatorGroup Proportion - 1079pt + 1109pt Proportion - 456pt + 510pt ContentConfiguration @@ -852,9 +859,9 @@ GeometryConfiguration Frame - {{0, 461}, {1079, 260}} + {{0, 515}, {1109, 260}} RubberWindowFrame - 297 75 1079 762 0 0 1440 878 + 254 61 1109 816 0 0 1440 878 Module PBXProjectFindModule @@ -863,7 +870,7 @@ Proportion - 721pt + 775pt Name @@ -877,13 +884,13 @@ TableOfContents 1C530D57069F1CE1000CFCEE - 12FC291A12BB848E00E9CFA8 - 12FC291B12BB848E00E9CFA8 + 1299582C12BEA40900C307EC + 1299582D12BEA40900C307EC 1CDD528C0622207200134675 1CD0528E0623707200166675 WindowString - 297 75 1079 762 0 0 1440 878 + 254 61 1109 816 0 0 1440 878 WindowToolGUID 1C530D57069F1CE1000CFCEE WindowToolIsVisible