Chameleon

Chameleon Commit Details

Date:2010-08-13 07:24:15 (7 years 3 months ago)
Author:Evan Lojewski
Commit:359
Parents: 358
Message:Used the wrong variable in the rebase function. created a rebase_location function to make the code a little cleaner.
Changes:
M/branches/meklort/i386/boot2/modules.c

File differences

branches/meklort/i386/boot2/modules.c
3737
3838
3939
40
40
4141
4242
4343
......
7676
7777
7878
79
79
8080
8181
82
82
8383
8484
8585
......
9494
9595
9696
97
97
9898
9999
100100
101101
102
102
103103
104104
105105
......
130130
131131
132132
133
133
134
135
134136
135137
136138
......
163165
164166
165167
166
167
168
169168
170
171169
170
172171
173172
174
173
175174
176
177
178
175
179176
180177
181178
......
184181
185182
186183
187
184
188185
189186
190187
......
192189
193190
194191
192
195193
196194
197195
198
196
197
198
199
200
199201
200202
201203
......
206208
207209
208210
211
209212
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225213
226214
227215
228
229216
230217
231218
......
242229
243230
244231
245
232
246233
247234
248235
......
284271
285272
286273
287
288274
289275
290276
......
309295
310296
311297
298
312299
313300
314301
......
316303
317304
318305
306
319307
320308
321309
......
347335
348336
349337
350
351
352338
353339
340
354341
355342
356343
......
363350
364351
365352
366
367
353
368354
369355
370356
371
372
373
357
374358
375359
360
376361
377
378362
379363
380
381
382
383
384
385
364
386365
387366
388367
368
389369
390370
391371
......
397377
398378
399379
400
401
402380
403381
404382
405
406
407
408
409
410
383
411384
412385
413386
......
422395
423396
424397
398
425399
426
427
428
429
430
431
432
433400
434401
435402
......
453420
454421
455422
456
457423
458424
459
460
461
462
463
464
465
425
466426
467427
468428
......
749709
750710
751711
712
713
714
715
716
752717
753718
754719
{
printf("Unable to locate module %s\n", modString);
getc();
return ERROR;
return 0;
}
unsigned int moduleSize = file_size(fh);
void* parse_mach(void* binary)
{
{
void (*module_start)(void) = NULL;
// Module info
char* moduleName = NULL;
UInt32 moduleVersion = 0;
UInt32 moduleCompat = 0;
struct dyld_info_command* dyldInfoCommand = NULL;
struct symtab_command* symtabCommand = NULL;
struct segment_command* segmentCommand = NULL;
struct dysymtab_command* dysymtabCommand = NULL;
//struct dysymtab_command* dysymtabCommand = NULL;
struct section* section = NULL;
UInt32 binaryIndex = sizeof(struct mach_header);
UInt16 cmd = 0;
// Parse hthrough th eload commands
// Parse through the load commands
if(((struct mach_header*)binary)->magic != MH_MAGIC)
{
printf("Module is not 32bit\n");
UInt32 sections = segmentCommand->nsects;
section = binary + binaryIndex + sizeof(struct segment_command);
while(sections)
// Loop untill needed variables are found
while(!(nonlazy && symbolStub) && sections)
{
// Look for some sections and save the addresses
if(strcmp(section->sectname, SECT_NON_LAZY_SYMBOL_PTR) == 0)
}
else if(strcmp(section->sectname, SECT_SYMBOL_STUBS) == 0)
{
/*printf("\tSection __symbol_stub at 0x%X (0x%X), %d symbols\n",
section->offset,
section->size / 6);*/
symbolStub = binary + section->offset;
//getc();
}
/*
else
{
//printf("Unhandled section %s\n", section->sectname);
printf("Unhandled section %s\n", section->sectname);
}
*/
sections--;
section++;
}
break;
case LC_DYSYMTAB:
dysymtabCommand = binary + binaryIndex;
//dysymtabCommand = binary + binaryIndex;
//printf("Unhandled loadcommand LC_DYSYMTAB\n");
break;
case LC_LOAD_WEAK_DYLIB ^ LC_REQ_DYLD:
dylibCommand = binary + binaryIndex;
char* module = binary + binaryIndex + ((UInt32)*((UInt32*)&dylibCommand->dylib.name));
// TODO: verify version
// =dylibCommand->dylib.current_version;
// =dylibCommand->dylib.compatibility_version;
load_module(module);
if(!load_module(module))
{
// Unable to load dependancy
return NULL;
}
break;
case LC_ID_DYLIB:
break;
case LC_DYLD_INFO:
// Bind and rebase info is stored here
dyldInfoCommand = binary + binaryIndex;
/*
printf("LC_DYLD_INFO:\n"
"\tRebase Offset: 0x%X\n"
"\tBind Offset: 0x%X\n"
"\tWeak Bind Offset: 0x%X\n"
"\tLazy Bind Offset: 0x%X\n"
"\tExport Offset: 0x%X\n",
dyldInfoCommand->rebase_off,
dyldInfoCommand->bind_off,
dyldInfoCommand->weak_bind_off,
dyldInfoCommand->lazy_bind_off,
dyldInfoCommand->export_off);
*/
break;
case LC_UUID:
// We don't care about the UUID at the moment
break;
default:
// bind_macho uses the symbols added in for some reason...
module_start = (void*)handle_symtable((UInt32)binary, symtabCommand, symbolStub, (UInt32)nonlazy);
// REbase the module before binding it.
if(dyldInfoCommand && dyldInfoCommand->rebase_off)
{
rebase_macho(binary, (char*)dyldInfoCommand->rebase_off, dyldInfoCommand->rebase_size);
UInt8 type = 0;
UInt32 segmentAddress = 0;
UInt32 address = 0;
done = 1;
break;
case REBASE_OPCODE_SET_TYPE_IMM:
// Set rebase type (pointer, absolute32, pcrel32)
//printf("Rebase type = 0x%X\n", immediate);
type = immediate;
break;
case REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB:
// Locate address to begin rebasing
segmentAddress = 0;
while(rebase_stream[i] & 0x80);
segmentAddress += tmp;
//printf("Address = 0x%X\n", segmentAddress);
break;
case REBASE_OPCODE_ADD_ADDR_ULEB:
// Add value to rebase address
tmp = 0;
}
while(rebase_stream[i] & 0x80);
address +=tmp;
//printf("Address (add) = 0x%X\n", address);
segmentAddress +=tmp;
break;
case REBASE_OPCODE_ADD_ADDR_IMM_SCALED:
address += immediate * sizeof(void*);
//printf("Address (immscaled) = 0x%X\n", address);
segmentAddress += immediate * sizeof(void*);
break;
case REBASE_OPCODE_DO_REBASE_IMM_TIMES:
//printf("Rebase %d time(s)\n", immediate);
index = 0;
for (index = 0; index < immediate; ++index) {
//printf("\tRebasing 0x%X\n", segmentAddress);
UInt32* addr = base + segmentAddress;
addr[0] += (UInt32)base;
//if(type != REBASE_TYPE_POINTER) addr[0] -= 8;
rebase_location(base + segmentAddress, (char*)base);
segmentAddress += sizeof(void*);
}
break;
case REBASE_OPCODE_DO_REBASE_ULEB_TIMES:
tmp = 0;
}
while(rebase_stream[i] & 0x80);
//printf("Rebase %d time(s)\n", tmp);
index = 0;
for (index = 0; index < tmp; ++index) {
//printf("\tRebasing 0x%X\n", segmentAddress);
UInt32* addr = base + segmentAddress;
addr[0] += (UInt32)base;
//if(type != REBASE_TYPE_POINTER) addr[0] -= 8;
rebase_location(base + segmentAddress, (char*)base);
segmentAddress += sizeof(void*);
}
break;
}
while(rebase_stream[i] & 0x80);
rebase_location(base + segmentAddress, (char*)base);
//printf("Rebase and add 0x%X\n", tmp);
//printf("\tRebasing 0x%X\n", segmentAddress);
UInt32* addr = base + segmentAddress;
addr[0] += (UInt32)base;
//if(type != REBASE_TYPE_POINTER) addr[0] -= 8;
segmentAddress += tmp + sizeof(void*);
break;
}
while(rebase_stream[i] & 0x80);
//printf("Rebase 0x%X times, skiping 0x%X\n",tmp, tmp2);
index = 0;
for (index = 0; index < tmp; ++index) {
//printf("\tRebasing 0x%X\n", segmentAddress);
UInt32* addr = base + segmentAddress;
addr[0] += (UInt32)base;
//if(type != REBASE_TYPE_POINTER) addr[0] -= 8;
rebase_location(base + segmentAddress, (char*)base);
segmentAddress += tmp2 + sizeof(void*);
}
}
}
inline void rebase_location(UInt32* location, char* base)
{
*location += (UInt32)base;
}
/*
* add_symbol
* This function adds a symbol from a module to the list of known symbols

Archive Download the corresponding diff file

Revision: 359