From 199b09cb7a3c590ccbf8d705c98cfde101378f20 Mon Sep 17 00:00:00 2001
From: Patrick Georgi <patrick.georgi@secunet.com>
Date: Thu, 22 Nov 2012 12:46:12 +0100
Subject: x86 realmode: Use x86emu register file + defines

By using the (global) register file as defined by x86emu,
we can use the same register access for YABEL and realmode
interrupt handlers.

- the x86 realmode interrupt handlers changed in signature
- to access registers, use X86_$REGNAME now (eg. X86_EAX)
- x86_exception_handler still uses struct eregs *regs to
  avoid spilling the x86emu register file stuff everywhere

Coccinelle script that handled most of this commit:
  @ inthandler @
  identifier FUNC, regs;
  @@
  int FUNC(
  -struct eregs *regs
  +void
   )
  { ... }

  @ depends on inthandler @
  identifier regs;
  @@
  -regs->eax
  +X86_EAX

  @ depends on inthandler @
  identifier regs;
  @@
  -regs->ebx
  +X86_EBX

  @ depends on inthandler @
  identifier regs;
  @@
  -regs->ecx
  +X86_ECX

  @ depends on inthandler @
  identifier regs;
  @@
  -regs->edx
  +X86_EDX

  @ depends on inthandler @
  identifier regs;
  @@
  -regs->esi
  +X86_ESI

  @ depends on inthandler @
  identifier regs;
  @@
  -regs->edi
  +X86_EDI

  @ depends on inthandler @
  identifier regs;
  @@
  -regs->eflags
  +X86_EFLAGS

  @ depends on inthandler @
  identifier regs;
  @@
  -regs->vector
  +M.x86.intno

Change-Id: I60cc2c36646fe4b7f97457b1e297e3df086daa36
Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com>
Reviewed-on: http://review.coreboot.org/1891
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
---
 src/mainboard/siemens/sitemp_g1p1/int15_func.c | 45 +++++++++++++-------------
 1 file changed, 23 insertions(+), 22 deletions(-)

(limited to 'src/mainboard/siemens')

diff --git a/src/mainboard/siemens/sitemp_g1p1/int15_func.c b/src/mainboard/siemens/sitemp_g1p1/int15_func.c
index c6531913ae..97402622f3 100644
--- a/src/mainboard/siemens/sitemp_g1p1/int15_func.c
+++ b/src/mainboard/siemens/sitemp_g1p1/int15_func.c
@@ -25,21 +25,22 @@
 #include <stdlib.h>
 #include <console/console.h>
 #include <arch/interrupt.h>
+#include <x86emu/regs.h>
 #include "int15_func.h"
 
-int sbios_INT15_handler(struct eregs *);
+int sbios_INT15_handler(void);
 /*extern*/ unsigned long vgainfo_addr;
 
 static INT15_function_extensions __int15_func;
 
 /* System BIOS int15 function */
-int sbios_INT15_handler(struct eregs *regs)
+int sbios_INT15_handler(void)
 {
     int res = -1;
 
     printk(BIOS_DEBUG, "System BIOS INT 15h\n");
 
-    switch (regs->eax & 0xffff) {
+    switch (X86_EAX & 0xffff) {
 #define BOOT_DISPLAY_DEFAULT    0
 #define BOOT_DISPLAY_CRT        (1 << 0)
 #define BOOT_DISPLAY_TV         (1 << 1)
@@ -50,42 +51,42 @@ int sbios_INT15_handler(struct eregs *regs)
 #define BOOT_DISPLAY_EFP2       (1 << 6)
 #define BOOT_DISPLAY_LCD2       (1 << 7)
 	case 0x5f35:
-		regs->eax = 0x5f;
-		regs->ecx = BOOT_DISPLAY_DEFAULT;
+		X86_EAX = 0x5f;
+		X86_ECX = BOOT_DISPLAY_DEFAULT;
 		res = 0;
 		break;
 	case 0x5f40:
-		regs->eax = 0x5f;
-		regs->ecx = 3; // This is mainboard specific
-		printk(BIOS_DEBUG, "DISPLAY=%x\n", regs->ecx);
+		X86_EAX = 0x5f;
+		X86_ECX = 3; // This is mainboard specific
+		printk(BIOS_DEBUG, "DISPLAY=%x\n", X86_ECX);
 		res = 0;
 		break;
     case 0x4e08:
-        switch (regs->ebx & 0xff) {
+        switch (X86_EBX & 0xff) {
         case 0x00:
-            regs->eax &= ~(0xff);
-            regs->ebx = (regs->ebx & ~(0xff)) | __int15_func.regs.func00_LCD_panel_id;
-			printk(BIOS_DEBUG, "DISPLAY = %x\n", regs->ebx & 0xff);
+            X86_EAX &= ~(0xff);
+            X86_EBX = (X86_EBX & ~(0xff)) | __int15_func.regs.func00_LCD_panel_id;
+			printk(BIOS_DEBUG, "DISPLAY = %x\n", X86_EBX & 0xff);
             res = 0;
 			break;
 		case 0x02:
 			break;
         case 0x05:
-            regs->eax &= ~(0xff);
-            regs->ebx = (regs->ebx & ~(0xff)) | __int15_func.regs.func05_TV_standard;
-			printk(BIOS_DEBUG, "TV = %x\n", regs->ebx & 0xff);
+            X86_EAX &= ~(0xff);
+            X86_EBX = (X86_EBX & ~(0xff)) | __int15_func.regs.func05_TV_standard;
+			printk(BIOS_DEBUG, "TV = %x\n", X86_EBX & 0xff);
             res = 0;
 			break;
 		case 0x80:
-			regs->eax &= ~(0xff);
-			regs->ebx &= ~(0xff);
-			printk(BIOS_DEBUG, "Integrated System Information = %x:%x\n", regs->edx, regs->edi);
-			vgainfo_addr = (regs->edx * 16) + regs->edi;
+			X86_EAX &= ~(0xff);
+			X86_EBX &= ~(0xff);
+			printk(BIOS_DEBUG, "Integrated System Information = %x:%x\n", X86_EDX, X86_EDI);
+			vgainfo_addr = (X86_EDX * 16) + X86_EDI;
 			res = 0;
 			break;
 		case 0x89:
-			regs->eax &= ~(0xff);
-			regs->ebx &= ~(0xff);
+			X86_EAX &= ~(0xff);
+			X86_EBX &= ~(0xff);
 			printk(BIOS_DEBUG, "Get supported display device information\n");
 			res = 0;
 			break;
@@ -94,7 +95,7 @@ int sbios_INT15_handler(struct eregs *regs)
         }
         break;
 	default:
-        printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", regs->eax & 0xffff);
+        printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", X86_EAX & 0xffff);
 		break;
     }
 
-- 
cgit v1.2.3