aboutsummaryrefslogtreecommitdiff
path: root/src/romlayout.S
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2012-02-11 10:49:45 -0500
committerKevin O'Connor <kevin@koconnor.net>2012-02-11 10:49:45 -0500
commit36feea9317b45abf3a540e9d82ad1723bebe3ebd (patch)
tree32d4ade2f810e2092253bb11629dc3f92e63896b /src/romlayout.S
parentb50488bb3912f50ac70055d3fc3200ff2303986b (diff)
downloadseabios-hppa-36feea9317b45abf3a540e9d82ad1723bebe3ebd.zip
seabios-hppa-36feea9317b45abf3a540e9d82ad1723bebe3ebd.tar.gz
seabios-hppa-36feea9317b45abf3a540e9d82ad1723bebe3ebd.tar.bz2
Direct compile 16bit C code instead of including via .S files.
Create a ".code16gcc" directive in src/code16gcc.s and use -Wa,src/code16gcc.s to tell gcc to compile directly to 16bit code. This eliminates the need to compile the C code to assembler and include in romlayout.S and vgaentry.S. This also allows those two assembler files to be compiled with debugging (-g) enabled. Also, includes some Makefile cleanups. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/romlayout.S')
-rw-r--r--src/romlayout.S11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/romlayout.S b/src/romlayout.S
index 5983a4a..c4b2ef1 100644
--- a/src/romlayout.S
+++ b/src/romlayout.S
@@ -1,18 +1,10 @@
// Rom layout and bios assembler to C interface.
//
-// Copyright (C) 2008,2009 Kevin O'Connor <kevin@koconnor.net>
+// Copyright (C) 2008-2012 Kevin O'Connor <kevin@koconnor.net>
// Copyright (C) 2002 MandrakeSoft S.A.
//
// This file may be distributed under the terms of the GNU LGPLv3 license.
-
-/****************************************************************
- * Include of 16bit C code
- ****************************************************************/
-
- .code16gcc
-#include "ccode.16.s"
-
#include "config.h" // CONFIG_*
#include "ioport.h" // PORT_A20
#include "bregs.h" // CR0_*
@@ -29,6 +21,7 @@
// %edx = return location (in 32bit mode)
// Clobbers: ecx, flags, segment registers, cr0, idt/gdt
DECLFUNC transition32
+ .code16gcc
transition32:
movl %eax, %ecx