80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed all the compile-breaking mistakes.

Browse Source
This commit is contained in:
OBattler
2018-01-01 03:15:06 +01:00
parent 0d7d168245
commit 8f180fdecd
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/x86_ops_amd.h
View File

@@ -8,20 +8,18 @@
* *
* AMD SYSCALL and SYSRET CPU Instructions. * AMD SYSCALL and SYSRET CPU Instructions.
* *
* Version: @(#)x86_ops_amd.h 1.0.0 2018/01/01 * Version: @(#)x86_ops_amd.h 1.0.1 2018/01/01
* *
* Author: Miran Grca, <mgrca8@gmail.com> * Author: Miran Grca, <mgrca8@gmail.com>
* Copyright 2016-2018 Miran Grca. * Copyright 2016-2018 Miran Grca.
*/ */
#ifndef internal_illegal
static int internal_illegal(char *s) static int internal_illegal(char *s)
{ {
cpu_state.pc = cpu_state.oldpc; cpu_state.pc = cpu_state.oldpc;
x86gpf(s, 0); x86gpf(s, 0);
return cpu_state.abrt; return cpu_state.abrt;
} }
#endif
/* 0 = Limit 0-15 /* 0 = Limit 0-15
1 = Base 0-15 1 = Base 0-15

11
src/cpu/x86_ops_i686.h
View File

@@ -8,21 +8,12 @@
* *
* x86 i686 (Pentium Pro/Pentium II) CPU Instructions. * x86 i686 (Pentium Pro/Pentium II) CPU Instructions.
* *
* Version: @(#)x86_ops_i686.h 1.0.1 2018/01/01 * Version: @(#)x86_ops_i686.h 1.0.2 2018/01/01
* *
* Author: Miran Grca, <mgrca8@gmail.com> * Author: Miran Grca, <mgrca8@gmail.com>
* Copyright 2016-2018 Miran Grca. * Copyright 2016-2018 Miran Grca.
*/ */
#ifndef internal_illegal
static int internal_illegal(char *s)
{
cpu_state.pc = cpu_state.oldpc;
x86gpf(s, 0);
return cpu_state.abrt;
}
#endif
/* 0 = Limit 0-15 /* 0 = Limit 0-15
1 = Base 0-15 1 = Base 0-15
2 = Base 16-23 (bits 0-7), Access rights 2 = Base 16-23 (bits 0-7), Access rights

12
src/keyboard_at.c
View File

@@ -8,15 +8,15 @@
* *
* Intel 8042 (AT keyboard controller) emulation. * Intel 8042 (AT keyboard controller) emulation.
* *
* Version: @(#)keyboard_at.c 1.0.12 2017/12/31 * Version: @(#)keyboard_at.c 1.0.13 2018/01/01
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
* *
* Copyright 2008-2017 Sarah Walker. * Copyright 2008-2018 Sarah Walker.
* Copyright 2016,2017 Miran Grca. * Copyright 2016,2018 Miran Grca.
* Copyright 2017 Fred N. van Kempen. * Copyright 2018 Fred N. van Kempen.
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
@@ -1011,9 +1011,13 @@ bad_command:
case ROM_MRTHOR: case ROM_MRTHOR:
case ROM_AP53: case ROM_AP53:
case ROM_P55T2S: case ROM_P55T2S:
#ifdef DEV_BRANCH
#ifdef USE_I686
case ROM_S1668: case ROM_S1668:
#endif
#ifdef GREENB #ifdef GREENB
case ROM_4GPV31: case ROM_4GPV31:
#endif
#endif #endif
/*Set extended controller RAM*/ /*Set extended controller RAM*/
kbdlog("ATkbd: set extended controller RAM\n"); kbdlog("ATkbd: set extended controller RAM\n");