Emulation/switch-coreboot
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-coreboot.git synced 2025-05-04 01:39:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change the GAS bug workaround in CAR code to be more readable.

Browse source 
The problem was that gas treated whitespace asargument delimiter.
Removing the whitespace in crtitical places is the most obvious fix.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


git-svn-id: svn://coreboot.org/repository/coreboot-v3@727 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Carl-Daniel Hailfinger 2008-08-09 19:16:43 +00:00
parent 22fe1e55c3
commit 71d814fac6
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arch/x86/amd/stage0.S
View file

@ -275,15 +275,10 @@ clear_fixed_var_mtrr_out:
* windowoffset is the 32k-aligned window into CAR size * windowoffset is the 32k-aligned window into CAR size
*/ */
.macro simplemask carsize, windowoffset .macro simplemask carsize, windowoffset
.set gas_bug_workaround,(((\carsize - \windowoffset) / 0x1000) - 4) /* DO NOT CHANGE THE FORMATTING of the two lines below! Whitespace is
extractmask gas_bug_workaround, %eax * interpreted as an argument delimiter by some versions of GNU as. */
.set gas_bug_workaround,(((\carsize - \windowoffset) / 0x1000)) extractmask (((\carsize-\windowoffset)/0x1000)-4), %eax
extractmask gas_bug_workaround, %edx extractmask (((\carsize-\windowoffset)/0x1000)), %edx
/* Without the gas bug workaround, the entire macro would consist only of the
* two lines below.
extractmask (((\carsize - \windowoffset) / 0x1000) - 4), %eax
extractmask (((\carsize - \windowoffset) / 0x1000)), %edx
*/
.endm .endm
#if CacheSize > 0x10000 #if CacheSize > 0x10000

13
arch/x86/stage0_i586.S
View file

@ -319,15 +319,10 @@ clear_fixed_var_mtrr_out:
* windowoffset is the 32k-aligned window into CAR size * windowoffset is the 32k-aligned window into CAR size
*/ */
.macro simplemask carsize, windowoffset .macro simplemask carsize, windowoffset
.set gas_bug_workaround,(((\carsize - \windowoffset) / 0x1000) - 4) /* DO NOT CHANGE THE FORMATTING of the two lines below! Whitespace is
extractmask gas_bug_workaround, %eax * interpreted as an argument delimiter by some versions of GNU as. */
.set gas_bug_workaround,(((\carsize - \windowoffset) / 0x1000)) extractmask (((\carsize-\windowoffset)/0x1000)-4), %eax
extractmask gas_bug_workaround, %edx extractmask (((\carsize-\windowoffset)/0x1000)), %edx
/* Without the gas bug workaround, the entire macro would consist only of the
* two lines below.
extractmask (((\carsize - \windowoffset) / 0x1000) - 4), %eax
extractmask (((\carsize - \windowoffset) / 0x1000)), %edx
*/
.endm .endm
#if CacheSize > 0x10000 #if CacheSize > 0x10000