Replace debug_exit calls with debug info while setting a failure.

Calling debug_exit at the end of a call doesn't help much - several of
the registers are already clobbered at this point.  It also increases
stack usage because it prevents call tail optimization in many places.

diff --git a/src/apm.c b/src/apm.c
index 5233bb9a1a95c5501dc21f7b2c0e373faf2f9ea3..63bb44f9e3f7a469cf77f31fba9cde5f9fe2c7bb 100644 (file)
--- a/src/apm.c
+++ b/src/apm.c
@@ -35,14 +35,14 @@ handle_155300(struct bregs *regs)
     // bit 0 : 16 bit interface supported
     // bit 1 : 32 bit interface supported
     regs->cx = 0x03;
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // APM real mode interface connect
 static void
 handle_155301(struct bregs *regs)
 {
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // Assembler entry points defined in romlayout.S
@@ -58,7 +58,7 @@ handle_155302(struct bregs *regs)
     regs->si = 0xfff0;   // 16 bit code segment size
     regs->cx = SEG_BIOS; // data segment address
     regs->di = 0xfff0;   // data segment length
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // APM 32 bit protected mode interface connect
@@ -73,14 +73,14 @@ handle_155303(struct bregs *regs)
     regs->esi = 0xfff0fff0;
     regs->dx = SEG_BIOS; // data segment address
     regs->di = 0xfff0; // data segment length
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // APM interface disconnect
 static void
 handle_155304(struct bregs *regs)
 {
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // APM cpu idle
@@ -89,7 +89,7 @@ handle_155305(struct bregs *regs)
 {
     irq_enable();
     hlt();
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // APM Set Power State
@@ -97,7 +97,7 @@ static void
 handle_155307(struct bregs *regs)
 {
     if (regs->bx != 1) {
-        set_cf(regs, 0);
+        set_success(regs);
         return;
     }
     switch (regs->cx) {
@@ -114,13 +114,13 @@ handle_155307(struct bregs *regs)
             hlt();
         break;
     }
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 static void
 handle_155308(struct bregs *regs)
 {
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // Get Power Status
@@ -133,15 +133,15 @@ handle_15530a(struct bregs *regs)
     regs->cl = 0xff; // unknown remaining time
     regs->dx = 0xffff; // unknown remaining time
     regs->si = 0x00; // zero battery
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // Get PM Event
 static void
 handle_15530b(struct bregs *regs)
 {
+    set_fail(regs);
     regs->ah = 0x80; // no event pending
-    set_cf(regs, 1);
 }
 
 // APM Driver Version
@@ -150,14 +150,14 @@ handle_15530e(struct bregs *regs)
 {
     regs->ah = 1;
     regs->al = 2;
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // APM Engage / Disengage
 static void
 handle_15530f(struct bregs *regs)
 {
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // APM Get Capabilities
@@ -166,13 +166,13 @@ handle_155310(struct bregs *regs)
 {
     regs->bl = 0;
     regs->cx = 0;
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 static void
 handle_1553XX(struct bregs *regs)
 {
-    set_cf(regs, 1);
+    set_fail(regs);
 }
 
 void VISIBLE16

diff --git a/src/cdrom.c b/src/cdrom.c
index b2caaf612a4b06d5eb3cb2a17b39f4e53b67258b..aa5dfd3becca9615b8f9bcbdf126224a39f0c6bc 100644 (file)
--- a/src/cdrom.c
+++ b/src/cdrom.c
@@ -112,9 +112,9 @@ cdrom_1346(struct bregs *regs, u8 device)
 static void
 cdrom_1349(struct bregs *regs, u8 device)
 {
+    set_fail(regs);
     // always send changed ??
     regs->ah = DISK_RET_ECHANGED;
-    set_cf(regs, 1);
 }
 
 static void

diff --git a/src/clock.c b/src/clock.c
index 6b1213713659ad76900be2a225d1e9a8dadad3c1..8c4f301b4475443b558f8600e020692d801e2894 100644 (file)
--- a/src/clock.c
+++ b/src/clock.c
@@ -51,7 +51,7 @@ handle_1a00(struct bregs *regs)
     regs->dx = ticks;
     regs->al = GET_BDA(timer_rollover);
     SET_BDA(timer_rollover, 0); // reset flag
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // Set Current Clock Count
@@ -62,7 +62,7 @@ handle_1a01(struct bregs *regs)
     SET_BDA(timer_counter, ticks);
     SET_BDA(timer_rollover, 0); // reset flag
     regs->ah = 0;
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // Read CMOS Time
@@ -70,7 +70,7 @@ static void
 handle_1a02(struct bregs *regs)
 {
     if (rtc_updating()) {
-        set_cf(regs, 1);
+        set_fail(regs);
         return;
     }
 
@@ -80,7 +80,7 @@ handle_1a02(struct bregs *regs)
     regs->dl = inb_cmos(CMOS_STATUS_B) & 0x01;
     regs->ah = 0;
     regs->al = regs->ch;
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // Set CMOS Time
@@ -109,7 +109,7 @@ handle_1a03(struct bregs *regs)
     outb_cmos(val8, CMOS_STATUS_B);
     regs->ah = 0;
     regs->al = val8; // val last written to Reg B
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // Read CMOS Date
@@ -118,7 +118,7 @@ handle_1a04(struct bregs *regs)
 {
     regs->ah = 0;
     if (rtc_updating()) {
-        set_cf(regs, 1);
+        set_fail(regs);
         return;
     }
     regs->cl = inb_cmos(CMOS_RTC_YEAR);
@@ -126,7 +126,7 @@ handle_1a04(struct bregs *regs)
     regs->dl = inb_cmos(CMOS_RTC_DAY_MONTH);
     regs->ch = inb_cmos(CMOS_CENTURY);
     regs->al = regs->ch;
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // Set CMOS Date
@@ -145,7 +145,7 @@ handle_1a05(struct bregs *regs)
     // My assumption: RegB = (RegB & 01111111b)
     if (rtc_updating()) {
         init_rtc();
-        set_cf(regs, 1);
+        set_fail(regs);
         return;
     }
     outb_cmos(regs->cl, CMOS_RTC_YEAR);
@@ -156,7 +156,7 @@ handle_1a05(struct bregs *regs)
     outb_cmos(val8, CMOS_STATUS_B);
     regs->ah = 0;
     regs->al = val8; // AL = val last written to Reg B
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // Set Alarm Time in CMOS
@@ -177,7 +177,7 @@ handle_1a06(struct bregs *regs)
     regs->ax = 0;
     if (val8 & 0x20) {
         // Alarm interrupt enabled already
-        set_cf(regs, 1);
+        set_fail(regs);
         return;
     }
     if (rtc_updating()) {
@@ -190,7 +190,7 @@ handle_1a06(struct bregs *regs)
     outb(inb(PORT_PIC2_DATA) & ~PIC2_IRQ8, PORT_PIC2_DATA); // enable IRQ 8
     // enable Status Reg B alarm bit, clear halt clock bit
     outb_cmos((val8 & 0x7f) | 0x20, CMOS_STATUS_B);
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // Turn off Alarm
@@ -212,21 +212,21 @@ handle_1a07(struct bregs *regs)
     outb_cmos(val8 & 0x57, CMOS_STATUS_B); // disable alarm bit
     regs->ah = 0;
     regs->al = val8; // val last written to Reg B
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 static void
 handle_1ab1(struct bregs *regs)
 {
     // XXX - pcibios stuff
-    set_cf(regs, 1);
+    set_fail(regs);
 }
 
 // Unsupported
 static void
 handle_1aXX(struct bregs *regs)
 {
-    set_cf(regs, 1);
+    set_fail(regs);
 }
 
 // INT 1Ah Time-of-day Service Entry Point
@@ -246,7 +246,6 @@ handle_1a(struct bregs *regs)
     case 0xb1: handle_1ab1(regs); break;
     default:   handle_1aXX(regs); break;
     }
-    debug_exit(regs);
 }
 
 // User Timer Tick
@@ -290,7 +289,7 @@ handle_158300(struct bregs *regs)
     if (GET_BDA(rtc_wait_flag) & RWS_WAIT_PENDING) {
         // Interval already set.
         DEBUGF("int15: Func 83h, failed, already waiting.\n" );
-        handle_ret(regs, RET_EUNSUPPORTED);
+        set_code_fail(regs, RET_EUNSUPPORTED);
     }
     // Interval not already set.
     SET_BDA(rtc_wait_flag, RWS_WAIT_PENDING);  // Set status byte.
@@ -306,7 +305,7 @@ handle_158300(struct bregs *regs)
     u8 bRegister = inb_cmos(CMOS_STATUS_B);
     outb_cmos(CMOS_STATUS_B, bRegister | CSB_EN_ALARM_IRQ);
 
-    set_cf(regs, 0); // XXX - no set ah?
+    set_success(regs); // XXX - no set ah?
 }
 
 // Clear interval requested
@@ -317,14 +316,14 @@ handle_158301(struct bregs *regs)
     // Turn off the Periodic Interrupt timer
     u8 bRegister = inb_cmos(CMOS_STATUS_B);
     outb_cmos(CMOS_STATUS_B, bRegister & ~CSB_EN_ALARM_IRQ);
-    set_cf(regs, 0); // XXX - no set ah?
+    set_success(regs); // XXX - no set ah?
 }
 
 static void
 handle_1583XX(struct bregs *regs)
 {
+    set_code_fail(regs, RET_EUNSUPPORTED);
     regs->al--;
-    handle_ret(regs, RET_EUNSUPPORTED);
 }
 
 void

diff --git a/src/disk.c b/src/disk.c
index b7d004d08f06daa1449d9060fa13727f30bc3a4d..99655120153065456d0e9244cf534a4358ef6601 100644 (file)
--- a/src/disk.c
+++ b/src/disk.c
@@ -707,7 +707,6 @@ handle_40(struct bregs *regs)
 {
     debug_enter(regs);
     handle_legacy_disk(regs, regs->dl);
-    debug_exit(regs);
 }
 
 // INT 13h Fixed Disk Services Entry Point
@@ -720,20 +719,18 @@ handle_13(struct bregs *regs)
     if (CONFIG_CDROM_BOOT) {
         if (regs->ah == 0x4b) {
             cdemu_134b(regs);
-            goto done;
+            return;
         }
         if (GET_EBDA(cdemu.active)) {
             if (drive == GET_EBDA(cdemu.emulated_drive)) {
                 cdemu_13(regs);
-                goto done;
+                return;
             }
             if (drive < 0xe0)
                 drive--;
         }
     }
     handle_legacy_disk(regs, drive);
-done:
-    debug_exit(regs);
 }
 
 // record completion in BIOS task complete flag

diff --git a/src/floppy.c b/src/floppy.c
index a03523849bb17b75beab7c57389ec1ea4585ea8d..1c10f14be82fbba57f4ebbc963e1f6be5da453fc 100644 (file)
--- a/src/floppy.c
+++ b/src/floppy.c
@@ -334,16 +334,18 @@ floppy_media_sense(u8 drive)
 static inline void
 floppy_ret(struct bregs *regs, u8 code)
 {
-    regs->ah = code;
     SET_BDA(floppy_last_status, code);
-    set_cf(regs, code);
+    if (code)
+        set_code_fail(regs, code);
+    else
+        set_code_success(regs);
 }
 
 static inline void
 floppy_fail(struct bregs *regs, u8 code)
 {
-    regs->al = 0; // no sectors read
     floppy_ret(regs, code);
+    regs->al = 0; // no sectors read
 }
 
 static u16
@@ -476,8 +478,8 @@ floppy_1303(struct bregs *regs, u8 drive)
 
     if (data[0] & 0xc0) {
         if (data[1] & 0x02) {
+            set_fail(regs);
             regs->ax = 0x0300;
-            set_cf(regs, 1);
             return;
         }
         BX_PANIC("int13_diskette_function: read error\n");
@@ -549,8 +551,8 @@ floppy_1305(struct bregs *regs, u8 drive)
 
     if (data[0] & 0xc0) {
         if (data[1] & 0x02) {
+            set_fail(regs);
             regs->ax = 0x0300;
-            set_cf(regs, 1);
             return;
         }
         BX_PANIC("int13_diskette_function: read error\n");
@@ -581,7 +583,7 @@ floppy_1308(struct bregs *regs, u8 drive)
         regs->es = 0;
         regs->di = 0;
         regs->dl = num_floppies;
-        set_cf(regs, 0);
+        set_success(regs);
         return;
     }
 
@@ -658,15 +660,15 @@ floppy_1315(struct bregs *regs, u8 drive)
 {
     DEBUGF("floppy f15\n");
     if (drive > 1) {
+        set_fail(regs);
         regs->ah = 0; // only 2 drives supported
         // set_diskette_ret_status here ???
-        set_cf(regs, 1);
         return;
     }
     u8 drive_type = get_drive_type(drive);
 
     regs->ah = (drive_type != 0);
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // get diskette change line status

diff --git a/src/mouse.c b/src/mouse.c
index aeb1ef4fc3b16bb70b1df458bd47dac9bc4a7ff3..62070da90b2731b0858f5d62def3d4835f97704d 100644 (file)
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -94,7 +94,7 @@ mouse_15c20000(struct bregs *regs)
     send_to_mouse_ctrl(0xF5); // disable mouse command
     u8 mouse_data1;
     get_mouse_data(&mouse_data1);
-    handle_ret(regs, RET_SUCCESS);
+    set_code_success(regs);
 }
 
 #define BX_DEBUG_INT15(args...)
@@ -106,7 +106,7 @@ mouse_15c20001(struct bregs *regs)
     u8 mouse_flags_2 = GET_EBDA(mouse_flag2);
     if ((mouse_flags_2 & 0x80) == 0) {
         BX_DEBUG_INT15("INT 15h C2 Enable Mouse, no far call handler\n");
-        handle_ret(regs, RET_ENOHANDLER);
+        set_code_fail(regs, RET_ENOHANDLER);
         return;
     }
     inhibit_mouse_int_and_events(); // disable IRQ12 and packets
@@ -115,16 +115,16 @@ mouse_15c20001(struct bregs *regs)
     get_mouse_data(&mouse_data1);
     if (mouse_data1 == 0xFA) {
         enable_mouse_int_and_events(); // turn IRQ12 and packet generation on
-        handle_ret(regs, RET_SUCCESS);
+        set_code_success(regs);
         return;
     }
-    handle_ret(regs, RET_ENEEDRESEND);
+    set_code_fail(regs, RET_ENEEDRESEND);
 }
 
 static void
 mouse_15c200XX(struct bregs *regs)
 {
-    handle_ret(regs, RET_EINVFUNCTION);
+    set_code_fail(regs, RET_EINVFUNCTION);
 }
 
 // Disable/Enable Mouse
@@ -148,7 +148,7 @@ mouse_15c201(struct bregs *regs)
     get_mouse_data(&mouse_data3);
     // if no mouse attached, it will return RESEND
     if (mouse_data3 == 0xfe) {
-        handle_ret(regs, RET_ENEEDRESEND);
+        set_code_fail(regs, RET_ENEEDRESEND);
         return;
     }
     if (mouse_data3 != 0xfa)
@@ -160,7 +160,7 @@ mouse_15c201(struct bregs *regs)
     enable_mouse_int_and_events();
     regs->bl = mouse_data1;
     regs->bh = mouse_data2;
-    handle_ret(regs, RET_SUCCESS);
+    set_code_success(regs);
 }
 
 // Set Sample Rate
@@ -168,7 +168,7 @@ static void
 mouse_15c202(struct bregs *regs)
 {
     if (regs->bh >= 7) {
-        handle_ret(regs, RET_EUNSUPPORTED);
+        set_code_fail(regs, RET_EUNSUPPORTED);
         return;
     }
     u8 mouse_data1 = regs->bh * 20;
@@ -179,7 +179,7 @@ mouse_15c202(struct bregs *regs)
     get_mouse_data(&mouse_data2);
     send_to_mouse_ctrl(mouse_data1);
     get_mouse_data(&mouse_data2);
-    handle_ret(regs, RET_SUCCESS);
+    set_code_success(regs);
 }
 
 // Set Resolution
@@ -193,7 +193,7 @@ mouse_15c203(struct bregs *regs)
     //      3 = 200 dpi, 8 counts per millimeter
     u8 comm_byte = inhibit_mouse_int_and_events(); // disable IRQ12 and packets
     if (regs->bh >= 4) {
-        handle_ret(regs, RET_EUNSUPPORTED);
+        set_code_fail(regs, RET_EUNSUPPORTED);
         goto done;
     }
     send_to_mouse_ctrl(0xE8); // set resolution command
@@ -207,7 +207,7 @@ mouse_15c203(struct bregs *regs)
     if (mouse_data1 != 0xfa)
         BX_PANIC("Mouse status returned %02x (should be ack)\n"
                  , (unsigned)mouse_data1);
-    handle_ret(regs, RET_SUCCESS);
+    set_code_success(regs);
 
 done:
     set_kbd_command_byte(comm_byte); // restore IRQ12 and serial enable
@@ -223,7 +223,7 @@ mouse_15c204(struct bregs *regs)
     get_mouse_data(&mouse_data1);
     get_mouse_data(&mouse_data2);
     regs->bh = mouse_data2;
-    handle_ret(regs, RET_SUCCESS);
+    set_code_success(regs);
 }
 
 // Initialize Mouse
@@ -231,7 +231,7 @@ static void
 mouse_15c205(struct bregs *regs)
 {
     if (regs->bh != 3) {
-        handle_ret(regs, RET_EINTERFACE);
+        set_code_fail(regs, RET_EINTERFACE);
         return;
     }
     SET_EBDA(mouse_flag1, 0x00);
@@ -258,7 +258,7 @@ mouse_15c20600(struct bregs *regs)
     regs->bl = mouse_data1;
     regs->cl = mouse_data2;
     regs->dl = mouse_data3;
-    handle_ret(regs, RET_SUCCESS);
+    set_code_success(regs);
     set_kbd_command_byte(comm_byte); // restore IRQ12 and serial enable
 }
 
@@ -270,9 +270,9 @@ set_scaling(struct bregs *regs, u8 cmd)
     u8 mouse_data1;
     get_mouse_data(&mouse_data1);
     if (mouse_data1 != 0xFA)
-        handle_ret(regs, RET_EUNSUPPORTED);
+        set_code_fail(regs, RET_EUNSUPPORTED);
     else
-        handle_ret(regs, RET_SUCCESS);
+        set_code_success(regs);
     set_kbd_command_byte(comm_byte); // restore IRQ12 and serial enable
 }
 
@@ -326,13 +326,13 @@ mouse_15c207(struct bregs *regs)
         mouse_flags_2 |= 0x80;
     }
     SET_EBDA(mouse_flag2, mouse_flags_2);
-    handle_ret(regs, RET_SUCCESS);
+    set_code_success(regs);
 }
 
 static void
 mouse_15c2XX(struct bregs *regs)
 {
-    handle_ret(regs, RET_EINVFUNCTION);
+    set_code_fail(regs, RET_EINVFUNCTION);
 }
 
 void
@@ -341,7 +341,7 @@ handle_15c2(struct bregs *regs)
     //debug_stub(regs);
 
     if (! CONFIG_PS2_MOUSE) {
-        handle_ret(regs, RET_EUNSUPPORTED);
+        set_code_fail(regs, RET_EUNSUPPORTED);
         return;
     }
 

diff --git a/src/output.c b/src/output.c
index 7d2787f65a575b9d1a3b57db407717cd3e41d57f..df9ecb43289ed4049d6917e578db7495c9ffc2c7 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -199,11 +199,9 @@ __debug_enter(const char *fname, struct bregs *regs)
 }
 
 void
-__debug_exit(const char *fname, struct bregs *regs)
+__debug_fail(const char *fname, struct bregs *regs)
 {
-    if (! (regs->flags & F_CF))
-        return;
-    dump_regs(fname, "exit", regs);
+    dump_regs(fname, "fail", regs);
 }
 
 void

diff --git a/src/serial.c b/src/serial.c
index e6cb0523d50eea9bb420dd15f04f2a5357b69d84..c620a0fad9f5ee31f1f26312287ba1f5905f82f8 100644 (file)
--- a/src/serial.c
+++ b/src/serial.c
@@ -17,12 +17,12 @@ static u16
 getComAddr(struct bregs *regs)
 {
     if (regs->dx >= 4) {
-        set_cf(regs, 1);
+        set_fail(regs);
         return 0;
     }
     u16 addr = GET_BDA(port_com[regs->dx]);
     if (! addr)
-        set_cf(regs, 1);
+        set_fail(regs);
     return addr;
 }
 
@@ -44,7 +44,7 @@ handle_1400(struct bregs *regs)
     outb(regs->al & 0x1F, addr+3);
     regs->ah = inb(addr+5);
     regs->al = inb(addr+6);
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 static void
@@ -67,7 +67,7 @@ handle_1401(struct bregs *regs)
     regs->ah = inb(addr+5);
     if (!timeout)
         regs->ah |= 0x80;
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 static void
@@ -91,7 +91,7 @@ handle_1402(struct bregs *regs)
     } else {
         regs->ah = inb(addr+5);
     }
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 static void
@@ -102,14 +102,14 @@ handle_1403(struct bregs *regs)
         return;
     regs->ah = inb(addr+5);
     regs->al = inb(addr+6);
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 static void
 handle_14XX(struct bregs *regs)
 {
     // Unsupported
-    set_cf(regs, 1);
+    set_fail(regs);
 }
 
 // INT 14h Serial Communications Service Entry Point
@@ -127,7 +127,6 @@ handle_14(struct bregs *regs)
     case 0x03: handle_1403(regs); break;
     default:   handle_14XX(regs); break;
     }
-    debug_exit(regs);
 }
 
 
@@ -139,12 +138,12 @@ static u16
 getLptAddr(struct bregs *regs)
 {
     if (regs->dx >= 3) {
-        set_cf(regs, 1);
+        set_fail(regs);
         return 0;
     }
     u16 addr = GET_BDA(port_lpt[regs->dx]);
     if (! addr)
-        set_cf(regs, 1);
+        set_fail(regs);
     return addr;
 }
 
@@ -155,7 +154,7 @@ lpt_ret(struct bregs *regs, u16 addr, u16 timeout)
     regs->ah = (val8 ^ 0x48);
     if (!timeout)
         regs->ah |= 0x01;
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // INT 17 - PRINTER - WRITE CHARACTER
@@ -211,7 +210,7 @@ static void
 handle_17XX(struct bregs *regs)
 {
     // Unsupported
-    set_cf(regs, 1);
+    set_fail(regs);
 }
 
 // INT17h : Printer Service Entry Point
@@ -228,5 +227,4 @@ handle_17(struct bregs *regs)
     case 0x02: handle_1702(regs); break;
     default:   handle_17XX(regs); break;
     }
-    debug_exit(regs);
 }

diff --git a/src/system.c b/src/system.c
index 1f34c97a297b936b9387fd7f5f2707239f08c551..c92e1f03efe0c2c8c06ba1290f6ec450600ee09d 100644 (file)
--- a/src/system.c
+++ b/src/system.c
@@ -35,34 +35,34 @@ static void
 handle_152400(struct bregs *regs)
 {
     set_a20(0);
-    handle_ret(regs, 0);
+    set_code_success(regs);
 }
 
 static void
 handle_152401(struct bregs *regs)
 {
     set_a20(1);
-    handle_ret(regs, 0);
+    set_code_success(regs);
 }
 
 static void
 handle_152402(struct bregs *regs)
 {
     regs->al = !!(inb(PORT_A20) & 0x20);
-    handle_ret(regs, 0);
+    set_code_success(regs);
 }
 
 static void
 handle_152403(struct bregs *regs)
 {
     regs->bx = 3;
-    handle_ret(regs, 0);
+    set_code_success(regs);
 }
 
 static void
 handle_1524XX(struct bregs *regs)
 {
-    handle_ret(regs, RET_EUNSUPPORTED);
+    set_code_fail(regs, RET_EUNSUPPORTED);
 }
 
 static void
@@ -81,7 +81,7 @@ handle_1524(struct bregs *regs)
 static void
 handle_1552(struct bregs *regs)
 {
-    handle_ret(regs, 0);
+    set_code_success(regs);
 }
 
 // Wait for CX:DX microseconds. currently using the
@@ -196,7 +196,7 @@ handle_1587(struct bregs *regs)
 
     set_a20(prev_a20_enable);
 
-    handle_ret(regs, 0);
+    set_code_success(regs);
 }
 
 // Get the amount of extended memory (above 1M)
@@ -209,7 +209,7 @@ handle_1588(struct bregs *regs)
     // but real machines mostly return max. 63M.
     if (regs->ax > 0xffc0)
         regs->ax = 0xffc0;
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 // Device busy interrupt.  Called by Int 16h when no key available
@@ -228,6 +228,7 @@ handle_1591(struct bregs *regs)
 static void
 handle_154f(struct bregs *regs)
 {
+    // set_fail(regs);  -- don't report this failure.
     set_cf(regs, 1);
 }
 
@@ -236,14 +237,14 @@ handle_15c0(struct bregs *regs)
 {
     regs->es = SEG_BIOS;
     regs->bx = (u16)&BIOS_CONFIG_TABLE;
-    handle_ret(regs, 0);
+    set_code_success(regs);
 }
 
 static void
 handle_15c1(struct bregs *regs)
 {
     regs->es = GET_BDA(ebda_seg);
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 static void
@@ -272,7 +273,7 @@ handle_15e801(struct bregs *regs)
     regs->ax = regs->cx;
     regs->bx = regs->dx;
 
-    set_cf(regs, 0);
+    set_success(regs);
 }
 
 #define ACPI_DATA_SIZE    0x00010000L
@@ -300,7 +301,7 @@ static void
 handle_15e820(struct bregs *regs)
 {
     if (regs->edx != 0x534D4150) {
-        handle_ret(regs, RET_EUNSUPPORTED);
+        set_code_fail(regs, RET_EUNSUPPORTED);
         return;
     }
 
@@ -328,21 +329,21 @@ handle_15e820(struct bregs *regs)
         regs->ebx = 1;
         regs->eax = 0x534D4150;
         regs->ecx = 0x14;
-        set_cf(regs, 0);
+        set_success(regs);
         break;
     case 1:
         set_e820_range(regs->di, 0x0009fc00L, 0x000a0000L, E820_RESERVED);
         regs->ebx = 2;
         regs->eax = 0x534D4150;
         regs->ecx = 0x14;
-        set_cf(regs, 0);
+        set_success(regs);
         break;
     case 2:
         set_e820_range(regs->di, 0x000e8000L, 0x00100000L, E820_RESERVED);
         regs->ebx = 3;
         regs->eax = 0x534D4150;
         regs->ecx = 0x14;
-        set_cf(regs, 0);
+        set_success(regs);
         break;
     case 3:
         set_e820_range(regs->di, 0x00100000L,
@@ -350,7 +351,7 @@ handle_15e820(struct bregs *regs)
         regs->ebx = 4;
         regs->eax = 0x534D4150;
         regs->ecx = 0x14;
-        set_cf(regs, 0);
+        set_success(regs);
         break;
     case 4:
         set_e820_range(regs->di,
@@ -370,14 +371,14 @@ handle_15e820(struct bregs *regs)
         set_cf(regs, 0);
         break;
     default:  /* AX=E820, DX=534D4150, BX unrecognized */
-        handle_ret(regs, RET_EUNSUPPORTED);
+        set_code_fail(regs, RET_EUNSUPPORTED);
     }
 }
 
 static void
 handle_15e8XX(struct bregs *regs)
 {
-    handle_ret(regs, RET_EUNSUPPORTED);
+    set_code_fail(regs, RET_EUNSUPPORTED);
 }
 
 static void
@@ -393,7 +394,7 @@ handle_15e8(struct bregs *regs)
 static void
 handle_15XX(struct bregs *regs)
 {
-    handle_ret(regs, RET_EUNSUPPORTED);
+    set_code_fail(regs, RET_EUNSUPPORTED);
 }
 
 // INT 15h System Services Entry Point
@@ -418,7 +419,6 @@ handle_15(struct bregs *regs)
     case 0xe8: handle_15e8(regs); break;
     default:   handle_15XX(regs); break;
     }
-    //debug_exit(regs);
 }
 
 // INT 12h Memory Size Service Entry Point
@@ -427,7 +427,6 @@ handle_12(struct bregs *regs)
 {
     debug_enter(regs);
     regs->ax = GET_BDA(mem_size_kb);
-    debug_exit(regs);
 }
 
 // INT 11h Equipment List Service Entry Point
@@ -436,7 +435,6 @@ handle_11(struct bregs *regs)
 {
     debug_enter(regs);
     regs->ax = GET_BDA(equipment_list_flags);
-    debug_exit(regs);
 }
 
 // INT 05h Print Screen Service Entry Point

diff --git a/src/util.h b/src/util.h
index 82d3b6c50eb6caca95c3d57244ee139ea0ff278f..6938f0da03d3d04688e54f0ccee104c34ee33173 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -118,13 +118,11 @@ void __call16_int(struct bregs *callregs, u16 offset)
 void bprintf(u16 action, const char *fmt, ...)
     __attribute__ ((format (printf, 2, 3)));
 void __debug_enter(const char *fname, struct bregs *regs);
-void __debug_exit(const char *fname, struct bregs *regs);
+void __debug_fail(const char *fname, struct bregs *regs);
 void __debug_stub(const char *fname, struct bregs *regs);
 void __debug_isr(const char *fname, struct bregs *regs);
 #define debug_enter(regs) \
     __debug_enter(__func__, regs)
-#define debug_exit(regs) \
-    __debug_exit(__func__, regs)
 #define debug_stub(regs) \
     __debug_stub(__func__, regs)
 #define debug_isr(regs) \
@@ -132,6 +130,31 @@ void __debug_isr(const char *fname, struct bregs *regs);
 #define printf(fmt, args...)                     \
     bprintf(1, fmt , ##args )
 
+// Frequently used return codes
+#define RET_EUNSUPPORTED 0x86
+static inline void
+set_success(struct bregs *regs)
+{
+    set_cf(regs, 0);
+}
+
+static inline void
+set_code_success(struct bregs *regs)
+{
+    regs->ah = 0;
+    set_cf(regs, 0);
+}
+
+#define set_fail(regs) do {                     \
+        __debug_fail(__func__, (regs));         \
+        set_cf((regs), 1);                      \
+    } while (0)
+
+#define set_code_fail(regs, code) do {          \
+        (regs)->ah = (code);                    \
+        set_fail(regs);                         \
+    } while (0)
+
 // kbd.c
 void handle_15c2(struct bregs *regs);
 
@@ -141,15 +164,6 @@ void handle_1583(struct bregs *regs);
 // apm.c
 void VISIBLE16 handle_1553(struct bregs *regs);
 
-// Frequent bios return helper
-#define RET_EUNSUPPORTED 0x86
-static inline void
-handle_ret(struct bregs *regs, u8 code)
-{
-    regs->ah = code;
-    set_cf(regs, code);
-}
-
 // util.c
 void usleep(u32 count);