From eb462724b8dc25a4dace5e53a8c81a4d004684a7 Mon Sep 17 00:00:00 2001 From: Stanislav Shwartsman Date: Thu, 31 Jul 2003 18:54:48 +0000 Subject: [PATCH] FPU_Info was not implemented, remove it --- bochs/fpu/errors.c | 4 ++-- bochs/fpu/fpu_entry.c | 6 +++--- bochs/fpu/fpu_proto.h | 4 ++-- bochs/fpu/fpu_system.h | 10 +--------- bochs/fpu/load_store.c | 6 +++--- bochs/fpu/wmFPUemu_glue.cc | 2 +- 6 files changed, 12 insertions(+), 20 deletions(-) diff --git a/bochs/fpu/errors.c b/bochs/fpu/errors.c index 89b07d438..3e43ae659 100644 --- a/bochs/fpu/errors.c +++ b/bochs/fpu/errors.c @@ -1,6 +1,6 @@ /*---------------------------------------------------------------------------+ | errors.c | - | $Id: errors.c,v 1.6 2003-04-20 19:20:07 sshwarts Exp $ + | $Id: errors.c,v 1.7 2003-07-31 18:54:47 sshwarts Exp $ | | | The error handling functions for wm-FPU-emu | | | @@ -79,7 +79,7 @@ void Un_impl(void) */ void FPU_illegal(void) { - math_abort(FPU_info,SIGILL); + math_abort(NULL, SIGILL); } diff --git a/bochs/fpu/fpu_entry.c b/bochs/fpu/fpu_entry.c index 1b18ed150..ece0445fc 100644 --- a/bochs/fpu/fpu_entry.c +++ b/bochs/fpu/fpu_entry.c @@ -1,6 +1,6 @@ /*---------------------------------------------------------------------------+ | fpu_entry.c | - | $Id: fpu_entry.c,v 1.12 2003-07-31 17:39:24 sshwarts Exp $ + | $Id: fpu_entry.c,v 1.13 2003-07-31 18:54:48 sshwarts Exp $ | | | The entry functions for wm-FPU-emu | | | @@ -173,7 +173,7 @@ math_emulate(fpu_addr_modes addr_modes, */ do_the_FPU_interrupt: - math_abort(FPU_info, SIGFPE); + math_abort(NULL, SIGFPE); } } @@ -199,7 +199,7 @@ do_the_FPU_interrupt: { /* This table works for 16 and 32 bit protected mode */ if (access_limit < data_sizes_16[(byte1 >> 1) & 3]) - math_abort(FPU_info, SIGSEGV); + math_abort(NULL, SIGSEGV); } #endif unmasked = 0; /* Do this here to stop compiler warnings. */ diff --git a/bochs/fpu/fpu_proto.h b/bochs/fpu/fpu_proto.h index 85d7b810b..3b3d64303 100644 --- a/bochs/fpu/fpu_proto.h +++ b/bochs/fpu/fpu_proto.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: fpu_proto.h,v 1.8 2003-07-25 08:59:45 sshwarts Exp $ +// $Id: fpu_proto.h,v 1.9 2003-07-31 18:54:48 sshwarts Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2001 MandrakeSoft S.A. @@ -87,7 +87,7 @@ extern void ffreep(void); extern void fst_i_(void); extern void fstp_i(void); /* fpu_entry.c */ -extern void math_abort(struct info *info, unsigned int signal); +extern void math_abort(void *info, unsigned int signal); /* fpu_etc.c */ extern void FPU_etc(void); /* fpu_tags.c */ diff --git a/bochs/fpu/fpu_system.h b/bochs/fpu/fpu_system.h index 6df685525..cb699ada4 100644 --- a/bochs/fpu/fpu_system.h +++ b/bochs/fpu/fpu_system.h @@ -1,6 +1,6 @@ /*---------------------------------------------------------------------------+ | fpu_system.h | - | $Id: fpu_system.h,v 1.12 2003-07-31 17:39:24 sshwarts Exp $ + | $Id: fpu_system.h,v 1.13 2003-07-31 18:54:48 sshwarts Exp $ | | | Copyright (C) 1992,1994,1997 | | W. Metzenthen, 22 Parker St, Ormond, Vic 3163, | @@ -55,14 +55,6 @@ extern void math_emulate_init(void); extern unsigned fpu_get_ds(void); extern void fpu_set_ax(u16); -struct info { -#ifdef BX_NO_EMPTY_STRUCTS - unsigned char donotindexme; -#endif - }; - -#define FPU_info ((struct info *) NULL) - #define SIGSEGV 11 extern struct i387_t *current_i387; diff --git a/bochs/fpu/load_store.c b/bochs/fpu/load_store.c index 006c1129a..2623f4467 100644 --- a/bochs/fpu/load_store.c +++ b/bochs/fpu/load_store.c @@ -1,6 +1,6 @@ /*---------------------------------------------------------------------------+ | load_store.c | - | $Id: load_store.c,v 1.8 2003-07-31 17:39:24 sshwarts Exp $ + | $Id: load_store.c,v 1.9 2003-07-31 18:54:48 sshwarts Exp $ | | | This file contains most of the code to interpret the FPU instructions | | which load and store from user memory. | @@ -78,12 +78,12 @@ int FPU_load_store(u_char type, fpu_addr_modes addr_modes, if ( addr_modes.default_mode == SEG32 ) { if ( access_limit < data_sizes_32[type] ) - math_abort(FPU_info,SIGSEGV); + math_abort(NULL,SIGSEGV); } else if ( addr_modes.default_mode == PM16 ) { if ( access_limit < data_sizes_16[type] ) - math_abort(FPU_info,SIGSEGV); + math_abort(NULL,SIGSEGV); } #ifdef PARANOID else diff --git a/bochs/fpu/wmFPUemu_glue.cc b/bochs/fpu/wmFPUemu_glue.cc index b9b27b606..aea0519a5 100644 --- a/bochs/fpu/wmFPUemu_glue.cc +++ b/bochs/fpu/wmFPUemu_glue.cc @@ -256,7 +256,7 @@ fpu_put_user(unsigned val, bx_address ptr, unsigned len) } void -math_abort(struct info *info, unsigned int signal) +math_abort(void *info, unsigned int signal) { UNUSED(info); // info is always passed NULL #if BX_CPU_LEVEL >= 4