diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-28 20:51:00 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-28 20:51:00 +0100 |
| commit | d7dcc044cd586dc5ffaadb7b59355596222e16b3 (patch) | |
| tree | a224db7cb296bc8d57e167da508b125b5d588c9b | |
| parent | bdd11b58a4c381df205a89ff61c60cc28ee66fb3 (diff) | |
at-x86_64: Enable fpu/pic/pit macros
This must be replaced by 64bit equivalents, but let's enable them for now so
it can build.
* i386/i386/pic.h [ATX86_64]: Enable macros.
* i386/i386/pit.h [ATX86_64]: Likewise.
* i386/i386/fpu.c [ATX86_64]: Enable fpintr function.
| -rw-r--r-- | i386/i386/fpu.c | 2 | ||||
| -rw-r--r-- | i386/i386/pic.h | 4 | ||||
| -rw-r--r-- | i386/i386/pit.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/i386/i386/fpu.c b/i386/i386/fpu.c index 0887a32c..3118e4ca 100644 --- a/i386/i386/fpu.c +++ b/i386/i386/fpu.c @@ -874,7 +874,7 @@ fp_state_alloc(void) } } -#if AT386 && !defined(MACH_XEN) +#if (defined(AT386) || defined(ATX86_64)) && !defined(MACH_XEN) /* * Handle a coprocessor error interrupt on the AT386. * This comes in on line 5 of the slave PIC at SPL1. diff --git a/i386/i386/pic.h b/i386/i386/pic.h index 553c4bcc..f492de5e 100644 --- a/i386/i386/pic.h +++ b/i386/i386/pic.h @@ -59,7 +59,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ** The following are definitions used to locate the PICs in the system */ -#if defined(AT386) +#if defined(AT386) || defined(ATX86_64) #define ADDR_PIC_BASE 0x20 #define OFF_ICW 0x00 #define OFF_OCW 0x01 @@ -95,7 +95,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ** ICW2 */ -#if defined(AT386) +#if defined(AT386) || defined(ATX86_64) #define PICM_VECTBASE 0x40 #define PICS_VECTBASE PICM_VECTBASE + 0x08 #endif /* defined(AT386) */ diff --git a/i386/i386/pit.h b/i386/i386/pit.h index e65aae97..6b682280 100644 --- a/i386/i386/pit.h +++ b/i386/i386/pit.h @@ -45,7 +45,7 @@ NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(AT386) +#if defined(AT386) || defined(ATX86_64) /* Definitions for 8254 Programmable Interrupt Timer ports on AT 386 */ #define PITCTR0_PORT 0x40 /* counter 0 port */ #define PITCTR1_PORT 0x41 /* counter 1 port */ @@ -74,7 +74,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * Clock speed for the timer in hz divided by the constant HZ * (defined in param.h) */ -#if AT386 +#if defined(AT386) || defined(ATX86_64) #define CLKNUM 1193167 #endif /* AT386 */ |