Chameleon Commit Details - 2156 - Chameleon open source boot loader project.

Date:

2013-01-10 16:43:45 (11 years 3 months ago)

Author:

armel cadet-petit

Commit:

2156

Parents:

2155

Message:

updated platform.c and modules.c

Changes:

M	/branches/cparm/i386/libsaio/modules.h
M	/branches/cparm/i386/libsaio/platform.c
M	/branches/cparm/i386/libsaio/modules.c
M	/branches/cparm/CHANGES

File differences

-88
89 89
90 90
91 
92 
93 
94 
95 
96 
97 91
98 92
99 93
+#endif␊
␊
#if macho_64␊
unsigned int parse_mach(char *module, void* binary, long long(*symbol_handler)(char*, char*, long long, char));␊
#else␊
unsigned int parse_mach(char *module, void* binary, long long(*symbol_handler)(char*, char*, long long));␊
#endif␊
␊
#if macho_64␊
unsigned int handle_symtable(char *module, UInt32 base,␊
␉␉␉␉␉␉␉ struct symtab_command* symtabCommand,␊
␉␉␉␉␉␉␉ long long(*symbol_handler)(char*, char*, long long, char),␊
 #endif␊
 ␊
 #if macho_64␊
-unsigned int parse_mach(char *module, void* binary, long long(*symbol_handler)(char*, char*, long long, char));␊
-#else␊
-unsigned int parse_mach(char *module, void* binary, long long(*symbol_handler)(char*, char*, long long));␊
-#endif␊
-␊
-#if macho_64␊
 unsigned int handle_symtable(char *module, UInt32 base,␊
 ␉␉␉␉␉␉␉ struct symtab_command* symtabCommand,␊
 ␉␉␉␉␉␉␉ long long(*symbol_handler)(char*, char*, long long, char),␊

-98
99 99
100 100
101 
102 
103 
101
102
103
104
105
106
107
108
109
104 110
105 111
106 112
107 113
108 
109 
110 
111 114
112 115
113 116
... ...
153 156
154 157
155 158
156 
159
160
161
162
163
157 164
158 165
159 166
... ...
163 170
164 171
165 172
166 
173
174
167 175
168 176
169 177
170 178
171 
179
180
181
182
183
184
185
186
172 187
173 188
174 189
175 190
176 191
177 
178 
179 
180 
192
193
194
195
196
181 197
182 198
183 199
... ...
322 338
323 339
324 340
325 
341
326 342
327 
343
344
345
346
347
348
349
350
351
352
353
328 354
329 355
330 356
331 357
332 
333 
334 
335 
336 
337 
338 358
339 359
340 360
... ...
347 367
348 368
349 369
350 
351 
352 
353 
354 
355 
356 
357 
358 
370
371
372
373
374
359 375
360 376
361 377
378
379
362 380
363 381
364 
382
383
384
385
386
387
388
389
365 390
366 391
367 392
+}␊
␊
static struct env_struct *find_env(const char *name) {␊
    struct env_struct *var;␊
    ␊
␉if (setjmp(uterror) == -1) {␊
    struct env_struct *var = NULL;    ␊
␉CEXCEPTION_T e = CEXCEPTION_NONE;␊
␉␊
␉Try␊
␉{␊
␉␉HASH_FIND_STR( platform_env, name, var );  ␊
␉}␊
␉Catch(e)␊
␉{␊
#if DEBUG_PLATFORM␊
␉␉printf("find_env: Unable to find environement variable\n"); ␊
        getc();␊
#endif␊
␉␉return NULL;␊
␉} else {␊
␉␉HASH_FIND_STR( platform_env, name, var );  ␊
␉}␊
    return var;␊
}␊

        return;␊
    }␊
    if (Type == kEnvPtr) {␊
        if (!CopyVarPtr( var,  ptr, size)) return;␊
        if (!CopyVarPtr( var,  ptr, size)) ␊
␉␉{␊
␉␉␉free(var);␊
␉␉␉return;␊
␉␉}␊
    } ␊
    else if (Type == kEnvValue) ␊
        var->value = value;␊

    var->Type = Type;    ␊
    ␊
    var->name = newString(name);␊
    if (!var->name) {        ␊
    if (!var->name) { ␊
␉␉if (Type == kEnvPtr && var->ptr) free(var->ptr);␊
        free(var);␊
        return;␊
    }␊
␉␊
␉if (setjmp(uterror) == -1) {␊
␉CEXCEPTION_T e = CEXCEPTION_NONE;␊
␉␊
␉Try␊
␉{␊
␉␉HASH_ADD_KEYPTR( hh, platform_env, name, strlen(var->name), var );␊
␉}␊
␉Catch(e)␊
␉{␊
␉␉printf("_set_env: Unable to set environement variable"); // don't try to acces to the string 'name', ␊
␉␉//'cause we just returned from the longjump, stack as already changed state.␊
#if DEBUG_PLATFORM␊
␉␉getc();␊
#endif␊
␉␉return;␊
␉} else {␊
        HASH_ADD_KEYPTR( hh, platform_env, name, strlen(var->name), var );␊
␉}␊
␉␉if (Type == kEnvPtr && var->ptr) free(var->ptr);␊
␉␉free(var->name);␊
␉␉free(var);␊
␊
␉}␉␊
}␊
␊
/* Warning: set_env will create a new variable each time it will be called, ␊

␉return;    ␊
}␊
␊
static void delete_env(struct env_struct *var) {␊
static void delete_env(struct env_struct *var) {␉␊
␉␊
␉if (setjmp(uterror) == -1) {␊
␉CEXCEPTION_T e = CEXCEPTION_NONE;␊
␉␊
␉Try␊
␉{␊
␉␉HASH_DEL( platform_env, var);␊
        if (var->name) free(var->name);    ␊
␉␉if (var->Type == kEnvPtr && var->ptr) free(var->ptr);␊
        free(var);␊
␉}␊
␉Catch(e)␊
␉{␊
␉␉printf("delete_env: Unable to delete environement variable\n");␊
#if DEBUG_PLATFORM␊
        getc();␉␊
#endif␊
␉␉return;␊
␉} else {␊
␉␉HASH_DEL( platform_env, var);␊
        if (var->name) free(var->name);            ␊
        free(var);␊
        ␊
␉}␊
}␊
␊

}␊
␊
void free_platform_env(void) {␊
    struct env_struct *current_var, *tmp; ␊
    ␊
␉if (setjmp(uterror) == -1) {␊
␉␉printf("free_platform_env: Unable to delete all environement variables\n"); ␊
#if DEBUG_PLATFORM␊
␉␉getc();␊
#endif␊
␉␉return;␊
␉} else {␊
    struct env_struct *current_var, *tmp;    ␊
␉CEXCEPTION_T e = CEXCEPTION_NONE;␊
␉␊
␉Try␊
␉{␊
␉␉HASH_ITER(hh, platform_env, current_var, tmp) {    ␊
␉␉␉HASH_DEL(platform_env,current_var);␊
            if (current_var->name) free(current_var->name);␊
␉␉␉if (current_var->Type == kEnvPtr && current_var->ptr) free(current_var->ptr);␊
␊
␉␉}␊
␉␉free(current_var);␊
␉}     ␊
␉}␊
␉Catch(e)␊
␉{␊
␉␉printf("free_platform_env: Unable to delete all environement variables\n"); ␊
#if DEBUG_PLATFORM␊
␉␉getc();␊
#endif␊
␉}␊
}␊
␊
#if DEBUG_PLATFORM␊
 ...
 ...
 ...
 ...
 }␊
 ␊
 static struct env_struct *find_env(const char *name) {␊
-    struct env_struct *var;␊
-    ␊
-␉if (setjmp(uterror) == -1) {␊
+    struct env_struct *var = NULL;    ␊
+␉CEXCEPTION_T e = CEXCEPTION_NONE;␊
+␉␊
+␉Try␊
+␉{␊
+␉␉HASH_FIND_STR( platform_env, name, var );  ␊
+␉}␊
+␉Catch(e)␊
+␉{␊
 #if DEBUG_PLATFORM␊
 ␉␉printf("find_env: Unable to find environement variable\n"); ␊
         getc();␊
 #endif␊
-␉␉return NULL;␊
-␉} else {␊
-␉␉HASH_FIND_STR( platform_env, name, var );  ␊
 ␉}␊
     return var;␊
 }␊
         return;␊
     }␊
     if (Type == kEnvPtr) {␊
-        if (!CopyVarPtr( var,  ptr, size)) return;␊
+        if (!CopyVarPtr( var,  ptr, size)) ␊
+␉␉{␊
+␉␉␉free(var);␊
+␉␉␉return;␊
+␉␉}␊
     } ␊
     else if (Type == kEnvValue) ␊
         var->value = value;␊
     var->Type = Type;    ␊
     ␊
     var->name = newString(name);␊
-    if (!var->name) {        ␊
+    if (!var->name) { ␊
+␉␉if (Type == kEnvPtr && var->ptr) free(var->ptr);␊
         free(var);␊
         return;␊
     }␊
 ␉␊
-␉if (setjmp(uterror) == -1) {␊
+␉CEXCEPTION_T e = CEXCEPTION_NONE;␊
+␉␊
+␉Try␊
+␉{␊
+␉␉HASH_ADD_KEYPTR( hh, platform_env, name, strlen(var->name), var );␊
+␉}␊
+␉Catch(e)␊
+␉{␊
 ␉␉printf("_set_env: Unable to set environement variable"); // don't try to acces to the string 'name', ␊
 ␉␉//'cause we just returned from the longjump, stack as already changed state.␊
 #if DEBUG_PLATFORM␊
 ␉␉getc();␊
 #endif␊
-␉␉return;␊
-␉} else {␊
-        HASH_ADD_KEYPTR( hh, platform_env, name, strlen(var->name), var );␊
-␉}␊
+␉␉if (Type == kEnvPtr && var->ptr) free(var->ptr);␊
+␉␉free(var->name);␊
+␉␉free(var);␊
+␊
+␉}␉␊
 }␊
 ␊
 /* Warning: set_env will create a new variable each time it will be called, ␊
 ␉return;    ␊
 }␊
 ␊
-static void delete_env(struct env_struct *var) {␊
+static void delete_env(struct env_struct *var) {␉␊
 ␉␊
-␉if (setjmp(uterror) == -1) {␊
+␉CEXCEPTION_T e = CEXCEPTION_NONE;␊
+␉␊
+␉Try␊
+␉{␊
+␉␉HASH_DEL( platform_env, var);␊
+        if (var->name) free(var->name);    ␊
+␉␉if (var->Type == kEnvPtr && var->ptr) free(var->ptr);␊
+        free(var);␊
+␉}␊
+␉Catch(e)␊
+␉{␊
 ␉␉printf("delete_env: Unable to delete environement variable\n");␊
 #if DEBUG_PLATFORM␊
         getc();␉␊
 #endif␊
-␉␉return;␊
-␉} else {␊
-␉␉HASH_DEL( platform_env, var);␊
-        if (var->name) free(var->name);            ␊
-        free(var);␊
-        ␊
 ␉}␊
 }␊
 ␊
 }␊
 ␊
 void free_platform_env(void) {␊
-    struct env_struct *current_var, *tmp; ␊
-    ␊
-␉if (setjmp(uterror) == -1) {␊
-␉␉printf("free_platform_env: Unable to delete all environement variables\n"); ␊
-#if DEBUG_PLATFORM␊
-␉␉getc();␊
-#endif␊
-␉␉return;␊
-␉} else {␊
+    struct env_struct *current_var, *tmp;    ␊
+␉CEXCEPTION_T e = CEXCEPTION_NONE;␊
+␉␊
+␉Try␊
+␉{␊
 ␉␉HASH_ITER(hh, platform_env, current_var, tmp) {    ␊
 ␉␉␉HASH_DEL(platform_env,current_var);␊
             if (current_var->name) free(current_var->name);␊
+␉␉␉if (current_var->Type == kEnvPtr && current_var->ptr) free(current_var->ptr);␊
+␊
 ␉␉}␊
 ␉␉free(current_var);␊
-␉}     ␊
+␉}␊
+␉Catch(e)␊
+␉{␊
+␉␉printf("free_platform_env: Unable to delete all environement variables\n"); ␊
+#if DEBUG_PLATFORM␊
+␉␉getc();␊
+#endif␊
+␉}␊
 }␊
 ␊
 #if DEBUG_PLATFORM␊

Download the corresponding diff file