From 80ac7ce34a4802c8bf4f5ca9c0c24338c51a9074 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Thu, 29 Aug 2002 11:41:04 +0000 Subject: [PATCH] added files to Makefile and fixed resulting errors Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@243 --- src/fpu/Makefile.am | 2 +- src/fpu/fpu_flags.cpp | 4 ++-- src/fpu/fpu_types.h | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/fpu/Makefile.am b/src/fpu/Makefile.am index d1890ca6..fb3045f2 100644 --- a/src/fpu/Makefile.am +++ b/src/fpu/Makefile.am @@ -1,4 +1,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/include noinst_LIBRARIES = libfpu.a -libfpu_a_SOURCES = fpu.cpp fpu_load.h \ No newline at end of file +libfpu_a_SOURCES = fpu.cpp fpu_flags.cpp fpu_types.h fpu_instructions.h \ No newline at end of file diff --git a/src/fpu/fpu_flags.cpp b/src/fpu/fpu_flags.cpp index be463c0c..924614fc 100644 --- a/src/fpu/fpu_flags.cpp +++ b/src/fpu/fpu_flags.cpp @@ -19,8 +19,8 @@ #include "dosbox.h" #include "fpu.h" #include "pic.h" - -//extern FPU_Flag_Info fpu_flags; +#include "fpu_types.h" +extern FPU_Flag_Info fpu_flags; bool FPU_get_C3() { switch(fpu_flags.type) { diff --git a/src/fpu/fpu_types.h b/src/fpu/fpu_types.h index 1079dbf8..2d0ced0f 100644 --- a/src/fpu/fpu_types.h +++ b/src/fpu/fpu_types.h @@ -1,4 +1,5 @@ + enum { FPUREG_VALID=0, FPUREG_ZERO, FPUREG_PNAN, FPUREG_NNAN, FPUREG_EMPTY }; enum { @@ -6,12 +7,12 @@ enum { t_FDIVP, t_FCHS, t_FCOMP, t_FUNKNOWN, - t_FNOTDONE, + t_FNOTDONE }; struct FPU_Flag_Info { struct { - Real r; + Real64 r; Bit8u tag; } var1,var2, result; struct { @@ -27,6 +28,6 @@ struct FPU_Flag_Info { }; struct FPU_Reg { - Real r; + Real64 r; Bit8u tag; };