Chameleon

Chameleon Commit Details

Date:2013-12-02 12:06:56 (5 years 6 months ago)
Author:Jief Luce
Commit:2273
Parents: 2272
Message:Xcode 5 compatibility (imported from trunk)
Changes:
M/branches/Jief/i386/libsaio/msdos.c
M/branches/Jief/i386/libsaio/spd.c
M/branches/Jief/i386/boot2/modules.c
M/branches/Jief/i386/libsaio/cpu.h
M/branches/Jief/i386/boot2/modules.h

File differences

branches/Jief/i386/libsaio/spd.c
296296
297297
298298
299
299
300300
301301
302302
switch (slot->spd[SPD_MEMORY_TYPE]) {
case SPD_MEMORY_TYPE_SDRAM_DDR2:
slot->ModuleSize = ((1 << (slot->spd[SPD_NUM_ROWS] & 0x0f) + (slot->spd[SPD_NUM_COLUMNS] & 0x0f) - 17) *
slot->ModuleSize = ((1 << ((slot->spd[SPD_NUM_ROWS] & 0x0f) + (slot->spd[SPD_NUM_COLUMNS] & 0x0f) - 17)) *
((slot->spd[SPD_NUM_DIMM_BANKS] & 0x7) + 1) * slot->spd[SPD_NUM_BANKS_PER_SDRAM]);
break;
branches/Jief/i386/libsaio/cpu.h
159159
160160
161161
162
162
163163
164164
165165
++count;
__asm__ volatile(
"inb$0x61,%0"
: "=q"(nmi_sc_val) /*:*/ /* no input */ /*:*/ /* no clobber */);
: "=a"(nmi_sc_val) /*:*/ /* no input */ /*:*/ /* no clobber */);
} while( (nmi_sc_val & 0x20) == 0);
return count;
}
branches/Jief/i386/libsaio/msdos.c
721721
722722
723723
724
724
725725
726726
727727
*flags = kFileTypeFlat;
// Calculate a fake timestamp using modification date and time values.
*time = (dirp->deMDate & 0x7FFF) << 16 + dirp->deMTime;
*time = ((dirp->deMDate & 0x7FFF) << 16) + dirp->deMTime;
if (infoValid)
*infoValid = 1;
branches/Jief/i386/boot2/modules.c
944944
945945
946946
947
947
948948
949949
950950
......
11581158
11591159
11601160
1161
1161
}
inline void bind_location(UInt32* location, char* value, UInt32 addend, int type)
static inline void bind_location(UInt32* location, char* value, UInt32 addend, int type)
{
// do actual update
char* newValue = value + addend;
start_function();
}
#endif
#endif
branches/Jief/i386/boot2/modules.h
9595
9696
9797
98
98
9999
100
100
101101
102102
103103
......
119119
120120
121121
122
122
long long(*symbol_handler)(char*, long long, char),
char is64);
voidrebase_macho(void* base, char* rebase_stream, UInt32 size);
inline voidrebase_location(UInt32* location, char* base, int type);
static inline voidrebase_location(UInt32* location, char* base, int type);
voidbind_macho(void* base, UInt8* bind_stream, UInt32 size);
inline voidbind_location(UInt32* location, char* value, UInt32 addend, int type);
static inline voidbind_location(UInt32* location, char* value, UInt32 addend, int type);
/********************************************************************************/
void dyld_stub_binder();
#endif /* __BOOT_MODULES_H */
#endif /* __BOOT_MODULES_H */

Archive Download the corresponding diff file

Revision: 2273