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

Date:

2011-08-21 10:08:20 (12 years 8 months ago)

Author:

JrCs

Commit:

1446

Parents:

1445

Message:

Fix multiboot

Changes:

M	/trunk/i386/boot2/mboot.c

File differences

-310
311 311
312 312
313 
313
314
315
314 316
315 317
316 318
+    continue_at_low_address();␊
␊
    // Now fix our return address.␊
    FIX_RETURN_ADDRESS_USING_FIRST_ARG(multiboot_magic);␊
␉// JrCs: this macro should be rewritten because the code generated by XCode 4.x␊
␉//       change the value of the argument passed as parameter (multiboot_magic)␊
    // FIX_RETURN_ADDRESS_USING_FIRST_ARG(multiboot_magic);␊
␊
    // We can now do just about anything, including return to our caller correctly.␊
    // However, our caller must fix his return address if he wishes to return to␊
     continue_at_low_address();␊
 ␊
     // Now fix our return address.␊
-    FIX_RETURN_ADDRESS_USING_FIRST_ARG(multiboot_magic);␊
+␉// JrCs: this macro should be rewritten because the code generated by XCode 4.x␊
+␉//       change the value of the argument passed as parameter (multiboot_magic)␊
+    // FIX_RETURN_ADDRESS_USING_FIRST_ARG(multiboot_magic);␊
 ␊
     // We can now do just about anything, including return to our caller correctly.␊
     // However, our caller must fix his return address if he wishes to return to␊