Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 17:56:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ASM] Fixed ".double" macro in asm.inc.

Browse source 
GAS uses ".double" symbol for declaring floating-point constants and
".quad" symbol for declaring 64-bit numbers.
This is not compatible with our macro for MASM and introduces bugs.
Now 64-bit constants are supposed to be declared using ".quad" macro.
This commit is contained in:
Victor Perevertkin 2018-07-15 18:49:49 +03:00 • committed by Hermès BÉLUSCA - MAÏTO
parent 4ffa0a2e55
commit 2ae1675208
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boot/freeldr/freeldr/arch/amd64/entry.S
View file

@ -25,7 +25,7 @@ RealEntryPoint:
jmp qword ptr [ContinueAddress] jmp qword ptr [ContinueAddress]
ContinueAddress: ContinueAddress:
.double offset FrldrStartup .quad offset FrldrStartup
FrldrStartup: FrldrStartup:
@ -120,7 +120,7 @@ CallRealMode_return:
/* 64-bit stack pointer */ /* 64-bit stack pointer */
stack64: stack64:
.double STACKADDR .quad STACKADDR
PUBLIC FrldrBootDrive PUBLIC FrldrBootDrive
FrldrBootDrive: FrldrBootDrive:

6
sdk/include/asm/asm.inc
View file

@ -136,10 +136,14 @@ ENDM
dd args dd args
ENDM ENDM
.double MACRO args:VARARG .quad MACRO args:VARARG
dq args dq args
ENDM ENDM
.double MACRO args:VARARG
real8 args
ENDM
.org MACRO value .org MACRO value
ORG value ORG value
ENDM ENDM

6
sdk/lib/crt/except/amd64/cpp.s
View file

@ -8,18 +8,18 @@
MACRO(START_VTABLE, shortname, cxxname) MACRO(START_VTABLE, shortname, cxxname)
EXTERN shortname&_rtti:PROC EXTERN shortname&_rtti:PROC
EXTERN MSVCRT_&shortname&_vector_dtor:PROC EXTERN MSVCRT_&shortname&_vector_dtor:PROC
.double shortname&_rtti .quad shortname&_rtti
PUBLIC MSVCRT_&shortname&_vtable PUBLIC MSVCRT_&shortname&_vtable
MSVCRT_&shortname&_vtable: MSVCRT_&shortname&_vtable:
PUBLIC &cxxname PUBLIC &cxxname
&cxxname: &cxxname:
.double MSVCRT_&shortname&_vector_dtor .quad MSVCRT_&shortname&_vector_dtor
ENDM ENDM
MACRO(DEFINE_EXCEPTION_VTABLE, shortname, cxxname) MACRO(DEFINE_EXCEPTION_VTABLE, shortname, cxxname)
START_VTABLE shortname, cxxname START_VTABLE shortname, cxxname
EXTERN MSVCRT_what_exception:ABS EXTERN MSVCRT_what_exception:ABS
.double MSVCRT_what_exception .quad MSVCRT_what_exception
ENDM ENDM
START_VTABLE type_info, __dummyname_type_info START_VTABLE type_info, __dummyname_type_info