mirror of
https://github.com/reactos/reactos.git
synced 2025-02-24 17:34:57 +00:00
- Build FreeLdr the same way other modules are built, by using gcc -Wl.
- This allows us to get rid of the /math directory and use -lgcc instead. - Get rid of -ffreestanding, -fno-builtin and -O2. The former are not needed anymore since we're properly building a "freestanding" image anyway, just like the kernel. The latter is removed since optimization flags come from the project settings. - Update code to fix warnings caused since we've removed -ffreestanding. GCC now warns about printf, sprintf and other C calls (including a change from %wZ to %S in winldr.c's sprintf calls). - Don't use printf anymore -- rename freeldr's implementation to TuiPrintf. Just like in the kernel, you can't use printf in freeldr (since it's not running in a standard/full CRT environment). - 124kb saved! svn path=/trunk/; revision=32120
This commit is contained in:
parent
286cc44351
commit
86a77f7088
22 changed files with 28 additions and 10321 deletions
|
@ -579,7 +579,7 @@ DetectBiosFloppyPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey)
|
|||
MmHeapFree(PartialResourceList);
|
||||
|
||||
/* Set 'Identifier' value */
|
||||
sprintf(Identifier, "FLOPPY%u", FloppyNumber + 1);
|
||||
sprintf(Identifier, "FLOPPY%ld", FloppyNumber + 1);
|
||||
FldrSetIdentifier(PeripheralKey, Identifier);
|
||||
}
|
||||
}
|
||||
|
@ -1218,7 +1218,7 @@ DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey)
|
|||
MmHeapFree(PartialResourceList);
|
||||
|
||||
/* Set 'Identifier' value */
|
||||
sprintf(Buffer, "COM%u", i + 1);
|
||||
sprintf(Buffer, "COM%ld", i + 1);
|
||||
FldrSetIdentifier(ControllerKey, Buffer);
|
||||
DbgPrint((DPRINT_HWDETECT,
|
||||
"Created value: Identifier %s\n",
|
||||
|
@ -1323,7 +1323,7 @@ DetectParallelPorts(PCONFIGURATION_COMPONENT_DATA BusKey)
|
|||
MmHeapFree(PartialResourceList);
|
||||
|
||||
/* Set 'Identifier' value */
|
||||
sprintf(Buffer, "PARALLEL%u", i + 1);
|
||||
sprintf(Buffer, "PARALLEL%ld", i + 1);
|
||||
FldrSetIdentifier(ControllerKey, Buffer);
|
||||
DbgPrint((DPRINT_HWDETECT,
|
||||
"Created value: Identifier %s\n",
|
||||
|
|
|
@ -91,7 +91,7 @@ VOID OptionMenuCustomBootDisk(VOID)
|
|||
|
||||
// Generate a unique section name
|
||||
MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second);
|
||||
sprintf(SectionName, "CustomBootDisk%d%d%d%d%d%d", Year, Day, Month, Hour, Minute, Second);
|
||||
sprintf(SectionName, "CustomBootDisk%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second);
|
||||
|
||||
// Add the section
|
||||
if (!IniAddSection(SectionName, &SectionId))
|
||||
|
@ -140,7 +140,7 @@ VOID OptionMenuCustomBootPartition(VOID)
|
|||
|
||||
// Generate a unique section name
|
||||
MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second);
|
||||
sprintf(SectionName, "CustomBootPartition%d%d%d%d%d%d", Year, Day, Month, Hour, Minute, Second);
|
||||
sprintf(SectionName, "CustomBootPartition%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second);
|
||||
|
||||
// Add the section
|
||||
if (!IniAddSection(SectionName, &SectionId))
|
||||
|
@ -202,7 +202,7 @@ VOID OptionMenuCustomBootBootSectorFile(VOID)
|
|||
|
||||
// Generate a unique section name
|
||||
MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second);
|
||||
sprintf(SectionName, "CustomBootSectorFile%d%d%d%d%d%d", Year, Day, Month, Hour, Minute, Second);
|
||||
sprintf(SectionName, "CustomBootSectorFile%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second);
|
||||
|
||||
// Add the section
|
||||
if (!IniAddSection(SectionName, &SectionId))
|
||||
|
@ -278,7 +278,7 @@ VOID OptionMenuCustomBootReactOS(VOID)
|
|||
|
||||
// Generate a unique section name
|
||||
MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second);
|
||||
sprintf(SectionName, "CustomReactOS%d%d%d%d%d%d", Year, Day, Month, Hour, Minute, Second);
|
||||
sprintf(SectionName, "CustomReactOS%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second);
|
||||
|
||||
// Add the section
|
||||
if (!IniAddSection(SectionName, &SectionId))
|
||||
|
@ -357,7 +357,7 @@ VOID OptionMenuCustomBootLinux(VOID)
|
|||
|
||||
// Generate a unique section name
|
||||
MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second);
|
||||
sprintf(SectionName, "CustomLinux%d%d%d%d%d%d", Year, Day, Month, Hour, Minute, Second);
|
||||
sprintf(SectionName, "CustomLinux%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second);
|
||||
|
||||
// Add the section
|
||||
if (!IniAddSection(SectionName, &SectionId))
|
||||
|
|
|
@ -41,7 +41,7 @@ VOID DiskError(PCSTR ErrorString, ULONG ErrorCode)
|
|||
if (bReportError == FALSE)
|
||||
return;
|
||||
|
||||
sprintf(ErrorCodeString, "%s\n\nError Code: 0x%x\nError: %s", ErrorString, ErrorCode, DiskGetErrorCodeString(ErrorCode));
|
||||
sprintf(ErrorCodeString, "%s\n\nError Code: 0x%lx\nError: %s", ErrorString, ErrorCode, DiskGetErrorCodeString(ErrorCode));
|
||||
|
||||
DbgPrint((DPRINT_DISK, "%s\n", ErrorCodeString));
|
||||
|
||||
|
|
|
@ -230,7 +230,7 @@ BOOLEAN DiskReadBootRecord(ULONG DriveNumber, ULONGLONG LogicalSectorNumber, PMA
|
|||
// Check the partition table magic value
|
||||
if (BootRecord->MasterBootRecordMagic != 0xaa55)
|
||||
{
|
||||
sprintf(ErrMsg, "Invalid partition table magic 0x%x found on drive 0x%x",
|
||||
sprintf(ErrMsg, "Invalid partition table magic 0x%x found on drive 0x%lx",
|
||||
BootRecord->MasterBootRecordMagic, DriveNumber);
|
||||
DiskError(ErrMsg, 0);
|
||||
return FALSE;
|
||||
|
|
|
@ -13,6 +13,9 @@
|
|||
<library>cmlib</library>
|
||||
<library>rtl</library>
|
||||
<library>libcntpr</library>
|
||||
<linkerflag>-nostartfiles</linkerflag>
|
||||
<linkerflag>-nostdlib</linkerflag>
|
||||
<linkerflag>-lgcc</linkerflag>
|
||||
</module>
|
||||
</if>
|
||||
<if property="ARCH" value="powerpc">
|
||||
|
|
|
@ -8,11 +8,8 @@
|
|||
<include base="freeldr_base">cache</include>
|
||||
<include base="ntoskrnl">include</include>
|
||||
<define name="_NTHAL_" />
|
||||
<compilerflag>-ffreestanding</compilerflag>
|
||||
<compilerflag>-fno-builtin</compilerflag>
|
||||
<compilerflag>-fno-inline</compilerflag>
|
||||
<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
|
||||
<compilerflag>-Os</compilerflag>
|
||||
<file>_alloca.S</file>
|
||||
<file>archmach.c</file>
|
||||
<file>hardware.c</file>
|
||||
|
|
|
@ -7,11 +7,8 @@
|
|||
<include base="ntoskrnl">include</include>
|
||||
<define name="_NTHAL_" />
|
||||
<define name="_NTSYSTEM_" />
|
||||
<compilerflag>-ffreestanding</compilerflag>
|
||||
<compilerflag>-fno-builtin</compilerflag>
|
||||
<compilerflag>-fno-inline</compilerflag>
|
||||
<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
|
||||
<compilerflag>-Os</compilerflag>
|
||||
<directory name="cache">
|
||||
<file>blocklist.c</file>
|
||||
<file>cache.c</file>
|
||||
|
@ -36,9 +33,6 @@
|
|||
<file>inifile.c</file>
|
||||
<file>parse.c</file>
|
||||
</directory>
|
||||
<directory name="math">
|
||||
<file>libgcc2.c</file>
|
||||
</directory>
|
||||
<directory name="mm">
|
||||
<file>meminit.c</file>
|
||||
<file>mm.c</file>
|
||||
|
|
|
@ -4,11 +4,8 @@
|
|||
<include base="freeldr_base64k">include</include>
|
||||
<include base="ntoskrnl">include</include>
|
||||
<define name="_NTHAL_" />
|
||||
<compilerflag>-ffreestanding</compilerflag>
|
||||
<compilerflag>-fno-builtin</compilerflag>
|
||||
<compilerflag>-fno-inline</compilerflag>
|
||||
<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
|
||||
<compilerflag>-Os</compilerflag>
|
||||
<directory name="arch">
|
||||
<if property="ARCH" value="i386">
|
||||
<directory name="i386">
|
||||
|
|
|
@ -4,11 +4,8 @@
|
|||
<include base="freeldr_main">include</include>
|
||||
<include base="ntoskrnl">include</include>
|
||||
<define name="_NTHAL_" />
|
||||
<compilerflag>-ffreestanding</compilerflag>
|
||||
<compilerflag>-fno-builtin</compilerflag>
|
||||
<compilerflag>-fno-inline</compilerflag>
|
||||
<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
|
||||
<compilerflag>-Os</compilerflag>
|
||||
<file>bootmgr.c</file>
|
||||
<file>drivemap.c</file>
|
||||
<file>miscboot.c</file>
|
||||
|
|
|
@ -3,8 +3,6 @@
|
|||
<module name="freeldr_startup" type="objectlibrary">
|
||||
<include base="freeldr_startup">include</include>
|
||||
<include base="ntoskrnl">include</include>
|
||||
<compilerflag>-ffreestanding</compilerflag>
|
||||
<compilerflag>-fno-builtin</compilerflag>
|
||||
<compilerflag>-fno-inline</compilerflag>
|
||||
<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
|
||||
<directory name="arch">
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#define NTOSAPI
|
||||
#define printf TuiPrintf
|
||||
#include <ntddk.h>
|
||||
#include <arc/arc.h>
|
||||
#include <ketypes.h>
|
||||
|
|
|
@ -46,7 +46,7 @@ VOID TuiMessageBoxCritical(PCSTR MessageText); // Displays a message box on t
|
|||
VOID TuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled
|
||||
VOID TuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled
|
||||
BOOLEAN TuiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length);
|
||||
|
||||
int TuiPrintf(const char *format, ... );
|
||||
UCHAR TuiTextToColor(PCSTR ColorText); // Converts the text color into it's equivalent color value
|
||||
UCHAR TuiTextToFillStyle(PCSTR FillStyleText); // Converts the text fill into it's equivalent fill value
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,301 +0,0 @@
|
|||
/* Header file for libgcc2.c. */
|
||||
/* Copyright (C) 2000, 2001
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GCC.
|
||||
|
||||
GCC is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU General Public License as published by the Free
|
||||
Software Foundation; either version 2, or (at your option) any later
|
||||
version.
|
||||
|
||||
GCC is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GCC; see the file COPYING. If not, write to the Free
|
||||
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
||||
02111-1307, USA. */
|
||||
|
||||
#ifndef GCC_LIBGCC2_H
|
||||
#define GCC_LIBGCC2_H
|
||||
|
||||
extern int __gcc_bcmp (const unsigned char *, const unsigned char *, size_t);
|
||||
extern void __clear_cache (char *, char *);
|
||||
extern void __eprintf (const char *, const char *, unsigned int, const char *)
|
||||
__attribute__ ((__noreturn__));
|
||||
|
||||
struct bb;
|
||||
extern void __bb_exit_func (void);
|
||||
extern void __bb_init_func (struct bb *);
|
||||
extern void __bb_fork_func (void);
|
||||
extern void __bb_trace_func (void);
|
||||
extern void __bb_trace_ret (void);
|
||||
extern void __bb_init_trace_func (struct bb *, unsigned long);
|
||||
|
||||
struct exception_descriptor;
|
||||
extern short int __get_eh_table_language (struct exception_descriptor *);
|
||||
extern short int __get_eh_table_version (struct exception_descriptor *);
|
||||
|
||||
/* Permit the tm.h file to select the endianness to use just for this
|
||||
file. This is used when the endianness is determined when the
|
||||
compiler is run. */
|
||||
|
||||
#ifndef LIBGCC2_WORDS_BIG_ENDIAN
|
||||
#define LIBGCC2_WORDS_BIG_ENDIAN WORDS_BIG_ENDIAN
|
||||
#endif
|
||||
|
||||
#ifndef LIBGCC2_LONG_DOUBLE_TYPE_SIZE
|
||||
#define LIBGCC2_LONG_DOUBLE_TYPE_SIZE LONG_DOUBLE_TYPE_SIZE
|
||||
#endif
|
||||
|
||||
#ifndef MIN_UNITS_PER_WORD
|
||||
#define MIN_UNITS_PER_WORD UNITS_PER_WORD
|
||||
#endif
|
||||
|
||||
/* In the first part of this file, we are interfacing to calls generated
|
||||
by the compiler itself. These calls pass values into these routines
|
||||
which have very specific modes (rather than very specific types), and
|
||||
these compiler-generated calls also expect any return values to have
|
||||
very specific modes (rather than very specific types). Thus, we need
|
||||
to avoid using regular C language type names in this part of the file
|
||||
because the sizes for those types can be configured to be anything.
|
||||
Instead we use the following special type names. */
|
||||
|
||||
typedef int QItype __attribute__ ((mode (QI)));
|
||||
typedef unsigned int UQItype __attribute__ ((mode (QI)));
|
||||
typedef int HItype __attribute__ ((mode (HI)));
|
||||
typedef unsigned int UHItype __attribute__ ((mode (HI)));
|
||||
#if MIN_UNITS_PER_WORD > 1
|
||||
/* These typedefs are usually forbidden on dsp's with UNITS_PER_WORD 1 */
|
||||
typedef int SItype __attribute__ ((mode (SI)));
|
||||
typedef unsigned int USItype __attribute__ ((mode (SI)));
|
||||
#if LONG_LONG_TYPE_SIZE > 32
|
||||
/* These typedefs are usually forbidden on archs with UNITS_PER_WORD 2 */
|
||||
typedef int DItype __attribute__ ((mode (DI)));
|
||||
typedef unsigned int UDItype __attribute__ ((mode (DI)));
|
||||
#if MIN_UNITS_PER_WORD > 4
|
||||
/* These typedefs are usually forbidden on archs with UNITS_PER_WORD 4 */
|
||||
typedef int TItype __attribute__ ((mode (TI)));
|
||||
typedef unsigned int UTItype __attribute__ ((mode (TI)));
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if BITS_PER_UNIT == 8
|
||||
|
||||
typedef float SFtype __attribute__ ((mode (SF)));
|
||||
typedef float DFtype __attribute__ ((mode (DF)));
|
||||
|
||||
#if LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 96
|
||||
typedef float XFtype __attribute__ ((mode (XF)));
|
||||
#endif
|
||||
#if LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 128
|
||||
typedef float TFtype __attribute__ ((mode (TF)));
|
||||
#endif
|
||||
|
||||
#else /* BITS_PER_UNIT != 8 */
|
||||
|
||||
/* On dsp's there are usually qf/hf/tqf modes used instead of the above.
|
||||
For now we don't support them in libgcc2.c. */
|
||||
|
||||
#undef L_fixdfdi
|
||||
#undef L_fixsfdi
|
||||
#undef L_fixtfdi
|
||||
#undef L_fixunsdfdi
|
||||
#undef L_fixunsdfsi
|
||||
#undef L_fixunssfdi
|
||||
#undef L_fixunssfsi
|
||||
#undef L_fixunstfdi
|
||||
#undef L_fixunsxfdi
|
||||
#undef L_fixunsxfsi
|
||||
#undef L_fixxfdi
|
||||
#undef L_floatdidf
|
||||
#undef L_floatdisf
|
||||
#undef L_floatditf
|
||||
#undef L_floatdixf
|
||||
|
||||
#endif /* BITS_PER_UNIT != 8 */
|
||||
|
||||
typedef int word_type __attribute__ ((mode (__word__)));
|
||||
|
||||
/* Make sure that we don't accidentally use any normal C language built-in
|
||||
type names in the first part of this file. Instead we want to use *only*
|
||||
the type names defined above. The following macro definitions insure
|
||||
that if we *do* accidentally use some normal C language built-in type name,
|
||||
we will get a syntax error. */
|
||||
|
||||
#define char bogus_type
|
||||
#define short bogus_type
|
||||
#define int bogus_type
|
||||
#define long bogus_type
|
||||
#define unsigned bogus_type
|
||||
#define float bogus_type
|
||||
#define double bogus_type
|
||||
|
||||
#if MIN_UNITS_PER_WORD > 4
|
||||
#define W_TYPE_SIZE (8 * BITS_PER_UNIT)
|
||||
#define Wtype DItype
|
||||
#define UWtype UDItype
|
||||
#define HWtype DItype
|
||||
#define UHWtype UDItype
|
||||
#define DWtype TItype
|
||||
#define UDWtype UTItype
|
||||
#define __NW(a,b) __ ## a ## di ## b
|
||||
#define __NDW(a,b) __ ## a ## ti ## b
|
||||
#elif MIN_UNITS_PER_WORD > 2 \
|
||||
|| (MIN_UNITS_PER_WORD > 1 && LONG_LONG_TYPE_SIZE > 32)
|
||||
#define W_TYPE_SIZE (4 * BITS_PER_UNIT)
|
||||
#define Wtype SItype
|
||||
#define UWtype USItype
|
||||
#define HWtype SItype
|
||||
#define UHWtype USItype
|
||||
#define DWtype DItype
|
||||
#define UDWtype UDItype
|
||||
#define __NW(a,b) __ ## a ## si ## b
|
||||
#define __NDW(a,b) __ ## a ## di ## b
|
||||
#elif MIN_UNITS_PER_WORD > 1
|
||||
#define W_TYPE_SIZE (2 * BITS_PER_UNIT)
|
||||
#define Wtype HItype
|
||||
#define UWtype UHItype
|
||||
#define HWtype HItype
|
||||
#define UHWtype UHItype
|
||||
#define DWtype SItype
|
||||
#define UDWtype USItype
|
||||
#define __NW(a,b) __ ## a ## hi ## b
|
||||
#define __NDW(a,b) __ ## a ## si ## b
|
||||
#else
|
||||
#define W_TYPE_SIZE BITS_PER_UNIT
|
||||
#define Wtype QItype
|
||||
#define UWtype UQItype
|
||||
#define HWtype QItype
|
||||
#define UHWtype UQItype
|
||||
#define DWtype HItype
|
||||
#define UDWtype UHItype
|
||||
#define __NW(a,b) __ ## a ## qi ## b
|
||||
#define __NDW(a,b) __ ## a ## hi ## b
|
||||
#endif
|
||||
|
||||
#define Wtype_MAX ((Wtype)(((UWtype)1 << (W_TYPE_SIZE - 1)) - 1))
|
||||
#define Wtype_MIN (- Wtype_MAX - 1)
|
||||
|
||||
#define __muldi3 __NDW(mul,3)
|
||||
#define __divdi3 __NDW(div,3)
|
||||
#define __udivdi3 __NDW(udiv,3)
|
||||
#define __moddi3 __NDW(mod,3)
|
||||
#define __umoddi3 __NDW(umod,3)
|
||||
#define __negdi2 __NDW(neg,2)
|
||||
#define __lshrdi3 __NDW(lshr,3)
|
||||
#define __ashldi3 __NDW(ashl,3)
|
||||
#define __ashrdi3 __NDW(ashr,3)
|
||||
#define __ffsdi2 __NDW(ffs,2)
|
||||
#define __cmpdi2 __NDW(cmp,2)
|
||||
#define __ucmpdi2 __NDW(ucmp,2)
|
||||
#define __udivmoddi4 __NDW(udivmod,4)
|
||||
#define __fixunstfDI __NDW(fixunstf,)
|
||||
#define __fixtfdi __NDW(fixtf,)
|
||||
#define __fixunsxfDI __NDW(fixunsxf,)
|
||||
#define __fixxfdi __NDW(fixxf,)
|
||||
#define __fixunsdfDI __NDW(fixunsdf,)
|
||||
#define __fixdfdi __NDW(fixdf,)
|
||||
#define __fixunssfDI __NDW(fixunssf,)
|
||||
#define __fixsfdi __NDW(fixsf,)
|
||||
#define __floatdixf __NDW(float,xf)
|
||||
#define __floatditf __NDW(float,tf)
|
||||
#define __floatdidf __NDW(float,df)
|
||||
#define __floatdisf __NDW(float,sf)
|
||||
#define __fixunsxfSI __NW(fixunsxf,)
|
||||
#define __fixunstfSI __NW(fixunstf,)
|
||||
#define __fixunsdfSI __NW(fixunsdf,)
|
||||
#define __fixunssfSI __NW(fixunssf,)
|
||||
|
||||
extern DWtype __muldi3 (DWtype, DWtype);
|
||||
extern DWtype __divdi3 (DWtype, DWtype);
|
||||
extern UDWtype __udivdi3 (UDWtype, UDWtype);
|
||||
extern UDWtype __umoddi3 (UDWtype, UDWtype);
|
||||
extern DWtype __moddi3 (DWtype, DWtype);
|
||||
|
||||
/* __udivmoddi4 is static inline when building other libgcc2 portions. */
|
||||
#if (!defined (L_udivdi3) && !defined (L_divdi3) && \
|
||||
!defined (L_umoddi3) && !defined (L_moddi3))
|
||||
extern UDWtype __udivmoddi4 (UDWtype, UDWtype, UDWtype *);
|
||||
#endif
|
||||
|
||||
/* __negdi2 is static inline when building other libgcc2 portions. */
|
||||
#if !defined(L_divdi3) && !defined(L_moddi3)
|
||||
extern DWtype __negdi2 (DWtype);
|
||||
#endif
|
||||
|
||||
extern DWtype __lshrdi3 (DWtype, word_type);
|
||||
extern DWtype __ashldi3 (DWtype, word_type);
|
||||
extern DWtype __ashrdi3 (DWtype, word_type);
|
||||
extern DWtype __ffsdi2 (DWtype);
|
||||
|
||||
/* __udiv_w_sdiv is static inline when building other libgcc2 portions. */
|
||||
#if (!defined(L_udivdi3) && !defined(L_divdi3) && \
|
||||
!defined(L_umoddi3) && !defined(L_moddi3))
|
||||
extern UWtype __udiv_w_sdiv (UWtype *, UWtype, UWtype, UWtype);
|
||||
#endif
|
||||
|
||||
extern word_type __cmpdi2 (DWtype, DWtype);
|
||||
extern word_type __ucmpdi2 (DWtype, DWtype);
|
||||
|
||||
extern Wtype __absvsi2 (Wtype);
|
||||
extern DWtype __absvdi2 (DWtype);
|
||||
extern Wtype __addvsi3 (Wtype, Wtype);
|
||||
extern DWtype __addvdi3 (DWtype, DWtype);
|
||||
extern Wtype __subvsi3 (Wtype, Wtype);
|
||||
extern DWtype __subvdi3 (DWtype, DWtype);
|
||||
extern Wtype __mulvsi3 (Wtype, Wtype);
|
||||
extern DWtype __mulvdi3 (DWtype, DWtype);
|
||||
extern Wtype __negvsi2 (Wtype);
|
||||
extern DWtype __negvdi2 (DWtype);
|
||||
|
||||
#if BITS_PER_UNIT == 8
|
||||
extern DWtype __fixdfdi (DFtype);
|
||||
extern DWtype __fixsfdi (SFtype);
|
||||
extern DFtype __floatdidf (DWtype);
|
||||
extern SFtype __floatdisf (DWtype);
|
||||
extern UWtype __fixunsdfSI (DFtype);
|
||||
extern UWtype __fixunssfSI (SFtype);
|
||||
extern DWtype __fixunsdfDI (DFtype);
|
||||
extern DWtype __fixunssfDI (SFtype);
|
||||
|
||||
#if LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 96
|
||||
extern DWtype __fixxfdi (XFtype);
|
||||
extern DWtype __fixunsxfDI (XFtype);
|
||||
extern XFtype __floatdixf (DWtype);
|
||||
extern UWtype __fixunsxfSI (XFtype);
|
||||
#endif
|
||||
|
||||
#if LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 128
|
||||
extern DWtype __fixunstfDI (TFtype);
|
||||
extern DWtype __fixtfdi (TFtype);
|
||||
extern TFtype __floatditf (DWtype);
|
||||
#endif
|
||||
#endif /* BITS_PER_UNIT == 8 */
|
||||
|
||||
/* DWstructs are pairs of Wtype values in the order determined by
|
||||
LIBGCC2_WORDS_BIG_ENDIAN. */
|
||||
|
||||
#if LIBGCC2_WORDS_BIG_ENDIAN
|
||||
struct DWstruct {Wtype high, low;};
|
||||
#else
|
||||
struct DWstruct {Wtype low, high;};
|
||||
#endif
|
||||
|
||||
/* We need this union to unpack/pack DImode values, since we don't have
|
||||
any arithmetic yet. Incoming DImode parameters are stored into the
|
||||
`ll' field, and the unpacked result is read from the struct `s'. */
|
||||
|
||||
typedef union
|
||||
{
|
||||
struct DWstruct s;
|
||||
DWtype ll;
|
||||
} DWunion;
|
||||
|
||||
#include "longlong.h"
|
||||
|
||||
#endif /* ! GCC_LIBGCC2_H */
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -445,6 +445,9 @@
|
|||
|
||||
#include <stdio.h>
|
||||
|
||||
int TuiPrintf(const char *format, ... );
|
||||
#define printf TuiPrintf
|
||||
|
||||
#ifdef lint
|
||||
#define NDEBUG /* Exits in asserts confuse lint */
|
||||
/* LINTLIBRARY */ /* Don't complain about def, no ref */
|
||||
|
|
|
@ -11,4 +11,7 @@
|
|||
<library>cmlib</library>
|
||||
<library>rtl</library>
|
||||
<library>libcntpr</library>
|
||||
<linkerflag>-nostartfiles</linkerflag>
|
||||
<linkerflag>-nostdlib</linkerflag>
|
||||
<linkerflag>-lgcc</linkerflag>
|
||||
</module>
|
||||
|
|
|
@ -25,7 +25,7 @@ PVOID TextVideoBuffer = NULL;
|
|||
* printf() - prints formatted text to stdout
|
||||
* originally from GRUB
|
||||
*/
|
||||
int printf(const char *format, ... )
|
||||
int TuiPrintf(const char *format, ... )
|
||||
{
|
||||
va_list ap;
|
||||
va_start(ap,format);
|
||||
|
|
|
@ -259,7 +259,7 @@ WinLdrLoadDeviceDriver(PLOADER_PARAMETER_BLOCK LoaderBlock,
|
|||
PVOID DriverBase;
|
||||
|
||||
// Separate the path to file name and directory path
|
||||
sprintf(DriverPath, "%wZ", FilePath);
|
||||
sprintf(DriverPath, "%S", FilePath->Buffer);
|
||||
DriverNamePos = strrchr(DriverPath, '\\');
|
||||
if (DriverNamePos != NULL)
|
||||
{
|
||||
|
@ -282,7 +282,7 @@ WinLdrLoadDeviceDriver(PLOADER_PARAMETER_BLOCK LoaderBlock,
|
|||
}
|
||||
|
||||
// It's not loaded, we have to load it
|
||||
sprintf(FullPath,"%s%wZ", BootPath, FilePath);
|
||||
sprintf(FullPath,"%s%S", BootPath, FilePath->Buffer);
|
||||
Status = WinLdrLoadImage(FullPath, LoaderBootDriver, &DriverBase);
|
||||
if (!Status)
|
||||
return FALSE;
|
||||
|
@ -586,3 +586,4 @@ WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -3547,11 +3547,11 @@ MingwBootLoaderModuleHandler::GenerateBootLoaderModuleTarget ()
|
|||
fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
|
||||
|
||||
fprintf ( fMakefile,
|
||||
"\t${ld} %s -N -Ttext=0x8000 -o %s %s %s\n",
|
||||
GetLinkerMacro ().c_str (),
|
||||
"\t${gcc} -Wl,--subsystem,native -Wl,-Ttext,0x8000 -o %s %s %s %s\n",
|
||||
backend->GetFullName ( junk_tmp ).c_str (),
|
||||
objectsMacro.c_str (),
|
||||
linkDepsMacro.c_str () );
|
||||
linkDepsMacro.c_str (),
|
||||
GetLinkerMacro ().c_str ());
|
||||
fprintf ( fMakefile,
|
||||
"\t${objcopy} -O binary %s $@\n",
|
||||
backend->GetFullName ( junk_tmp ).c_str () );
|
||||
|
|
Loading…
Reference in a new issue