Author: hbelusca
Date: Tue Jan 31 23:02:16 2017
New Revision: 73653
URL: http://svn.reactos.org/svn/reactos?rev=73653&view=rev
Log:
[FREELDR]: HACK: Manually reduce the size of the temporary heap from 32MB down to 10MB, because, in some situations (e.g. Bochs, or real HW, see CORE-12694), FreeLDR fails when creating the temporary heap with an "out of memory" error. First investigations seem to show that it's because FreeLDR cannot find a contiguous memory area of such size...
More investigations are in order.
I strongly think that this heap size should not be hardcoded, but instead computed, taking into account for the memory availability on a given system.
Modified:
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/freeldr/include/mm.h
Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/freeldr/include/mm.h
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
--- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original)
+++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Tue Jan 31 23:02:16 2017
@@ -121,7 +121,7 @@
/* Heap */
#define DEFAULT_HEAP_SIZE (1024 * 1024)
-#define TEMP_HEAP_SIZE (32 * 1024 * 1024)
+#define TEMP_HEAP_SIZE (10 * 1024 * 1024)
extern PVOID FrLdrDefaultHeap;
extern PVOID FrLdrTempHeap;
Author: hbelusca
Date: Tue Jan 31 22:08:35 2017
New Revision: 73652
URL: http://svn.reactos.org/svn/reactos?rev=73652&view=rev
Log:
Port trunk commit r73651.
Modified:
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/bootsect/isombr.S
Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/bootsect/isombr.S
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
--- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/bootsect/isombr.S [iso-8859-1] (original)
+++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/bootsect/isombr.S [iso-8859-1] Tue Jan 31 22:08:35 2017
@@ -9,7 +9,7 @@
.code16
// The "isohybrid" tool patching our ISO will write the LBA of the El Torito BIOS Boot Sector to this address.
-pBootSectorLBA = start+432;
+pBootSectorLBA = start+432
// Our BIOS Boot Sector contains this signature at the specified position and our third-party imported "isohybrid" patching tool checks for it.
// This is also why it's the same signature ISOLINUX uses.
@@ -96,6 +96,8 @@
jmp die
// The "isohybrid" tool will add the remaining information, including the infamous 0xAA55 MBR signature.
+.org 431
+ .byte 0
.endcode16
Author: hbelusca
Date: Tue Jan 31 22:08:19 2017
New Revision: 73651
URL: http://svn.reactos.org/svn/reactos?rev=73651&view=rev
Log:
[ISOMBR]: Pad isombr.S to the size expected by the 'isohybrid' tool.
Modified:
trunk/reactos/boot/freeldr/bootsect/isombr.S
Modified: trunk/reactos/boot/freeldr/bootsect/isombr.S
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isom…
==============================================================================
--- trunk/reactos/boot/freeldr/bootsect/isombr.S [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/bootsect/isombr.S [iso-8859-1] Tue Jan 31 22:08:19 2017
@@ -9,7 +9,7 @@
.code16
// The "isohybrid" tool patching our ISO will write the LBA of the El Torito BIOS Boot Sector to this address.
-pBootSectorLBA = start+432;
+pBootSectorLBA = start+432
// Our BIOS Boot Sector contains this signature at the specified position and our third-party imported "isohybrid" patching tool checks for it.
// This is also why it's the same signature ISOLINUX uses.
@@ -96,6 +96,8 @@
jmp die
// The "isohybrid" tool will add the remaining information, including the infamous 0xAA55 MBR signature.
+.org 431
+ .byte 0
.endcode16
Author: hbelusca
Date: Tue Jan 31 19:36:15 2017
New Revision: 73645
URL: http://svn.reactos.org/svn/reactos?rev=73645&view=rev
Log:
[BOOTDATA][FREELDR]
- By default, boot the livecd without the kernel debugger enabled, but...
- ... augment the FreeLdr "Debugging Mode" option with serial+screen debug ports, so that, if someone wants to run ReactOS with the kernel debugger on real hardware, without serial port, (s)he still can do it and see the debug output.
I do that, until FreeLdr can support run-time editing boot options of existing boot menu entries.
Modified:
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/freeldr/options.c
Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
--- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] (original)
+++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] Tue Jan 31 19:36:15 2017
@@ -33,12 +33,12 @@
[LiveCD]
BootType=Windows2003
SystemPath=\reactos
-Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
+Options=/MININT
[LiveCD_RamDisk]
BootType=Windows2003
SystemPath=ramdisk(0)\reactos
-Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd.iso /RDEXPORTASCD
+Options=/MININT /RDPATH=livecd.iso /RDEXPORTASCD
[HddBoot]
BootType=Drive
Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/freeldr/options.c
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
--- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] (original)
+++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] Tue Jan 31 19:36:15 2017
@@ -277,5 +277,9 @@
strcat(BootOptions, " /BASEVIDEO");
if (DebuggingMode)
+#if 0
strcat(BootOptions, " /DEBUG");
+#else
+ strcat(BootOptions, " /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /DEBUGPORT=SCREEN /SOS");
+#endif
}