2005-03-07 Jerome Guitton <guitton@gnat.com>

* sim/erc32/float.c (set_fsr): Do not use deprecated multi-line
	strings.
	(clear_accex): Ditto.
	* sim/erc32/interf.c: Remove the redeclaration of fprintf.
	* sim/erc32/sis.c: Ditto.
	* sim/erc32/exec.c: Add missing semicolon.
	* sim/erc32/func.c: Remove definitions of generic_print_address,
	generic_symbol_at_address, buffer_read_memory and perror_memory, as
	they are already defined in opcodes/dis-buf.c.
This commit is contained in:
Jerome Guitton 2005-03-07 11:09:05 +00:00
parent 0709bb2246
commit 187d3d28e2
6 changed files with 75 additions and 112 deletions

View File

@ -1,3 +1,15 @@
2005-03-07 Jerome Guitton <guitton@gnat.com>
* sim/erc32/float.c (set_fsr): Do not use deprecated multi-line
strings.
(clear_accex): Ditto.
* sim/erc32/interf.c: Remove the redeclaration of fprintf.
* sim/erc32/sis.c: Ditto.
* sim/erc32/exec.c: Add missing semicolon.
* sim/erc32/func.c: Remove definitions of generic_print_address,
generic_symbol_at_address, buffer_read_memory and perror_memory, as
they are already defined in opcodes/dis-buf.c.
2005-01-14 Andrew Cagney <cagney@gnu.org> 2005-01-14 Andrew Cagney <cagney@gnu.org>
* configure.ac: Sinclude aclocal.m4 before common.m4. Add * configure.ac: Sinclude aclocal.m4 before common.m4. Add

View File

@ -1713,6 +1713,7 @@ fpexec(op3, rd, rs1, rs2, sregs)
sregs->fdp[rs2 | 1] = sregs->fs[rs2 & ~1]; sregs->fdp[rs2 | 1] = sregs->fs[rs2 & ~1];
sregs->fdp[rs2 & ~1] = sregs->fs[rs2 | 1]; sregs->fdp[rs2 & ~1] = sregs->fs[rs2 | 1];
default: default:
;
} }
#endif #endif
@ -1885,6 +1886,7 @@ fpexec(op3, rd, rs1, rs2, sregs)
sregs->fs[rd & ~1] = sregs->fdp[rd | 1]; sregs->fs[rd & ~1] = sregs->fdp[rd | 1];
sregs->fs[rd | 1] = sregs->fdp[rd & ~1]; sregs->fs[rd | 1] = sregs->fdp[rd & ~1];
default: default:
;
} }
#endif #endif
if (sregs->fpstate == FP_EXC_PE) { if (sregs->fpstate == FP_EXC_PE) {

View File

@ -67,11 +67,11 @@ clear_accex()
#ifdef sparc #ifdef sparc
set_fsr((_get_fsr_raw() & ~0x3e0)); set_fsr((_get_fsr_raw() & ~0x3e0));
#elif i386 #elif i386
asm(" asm("\n"
.text ".text\n"
fnclex " fnclex\n"
"\n"
"); " ");
#else #else
#warning no fpu trap support for this target #warning no fpu trap support for this target
#endif #endif
@ -108,65 +108,65 @@ uint32 fsr;
#ifdef sparc #ifdef sparc
asm(" asm("\n"
"\n"
.text ".text\n"
.align 4 " .align 4\n"
.global __set_fsr_raw,_set_fsr_raw " .global __set_fsr_raw,_set_fsr_raw\n"
__set_fsr_raw: "__set_fsr_raw:\n"
_set_fsr_raw: "_set_fsr_raw:\n"
save %sp,-104,%sp " save %sp,-104,%sp\n"
st %i0,[%fp+68] " st %i0,[%fp+68]\n"
ld [%fp+68], %fsr " ld [%fp+68], %fsr\n"
mov 0,%i0 " mov 0,%i0\n"
ret " ret\n"
restore " restore\n"
"\n"
.align 4 " .align 4\n"
.global __get_fsr_raw " .global __get_fsr_raw\n"
.global _get_fsr_raw " .global _get_fsr_raw\n"
__get_fsr_raw: "__get_fsr_raw:\n"
_get_fsr_raw: "_get_fsr_raw:\n"
save %sp,-104,%sp " save %sp,-104,%sp\n"
st %fsr,[%fp+68] " st %fsr,[%fp+68]\n"
ld [%fp+68], %i0 " ld [%fp+68], %i0\n"
ret " ret\n"
restore " restore\n"
"\n"
"); " ");
#elif i386 #elif i386
asm(" asm("\n"
"\n"
.text ".text\n"
.align 8 " .align 8\n"
.globl _get_sw,__get_sw ".globl _get_sw,__get_sw\n"
__get_sw: "__get_sw:\n"
_get_sw: "_get_sw:\n"
pushl %ebp " pushl %ebp\n"
movl %esp,%ebp " movl %esp,%ebp\n"
movl $0,%eax " movl $0,%eax\n"
fnstsw %ax " fnstsw %ax\n"
movl %ebp,%esp " movl %ebp,%esp\n"
popl %ebp " popl %ebp\n"
ret " ret\n"
"\n"
.align 8 " .align 8\n"
.globl _get_cw,__get_cw ".globl _get_cw,__get_cw\n"
__get_cw: "__get_cw:\n"
_get_cw: "_get_cw:\n"
pushl %ebp " pushl %ebp\n"
movl %esp,%ebp " movl %esp,%ebp\n"
subw $2,%esp " subw $2,%esp\n"
fnstcw -2(%ebp) " fnstcw -2(%ebp)\n"
movw -2(%ebp),%eax " movw -2(%ebp),%eax\n"
movl %ebp,%esp " movl %ebp,%esp\n"
popl %ebp " popl %ebp\n"
ret " ret\n"
"\n"
"\n"
"); " ");
#else #else

View File

@ -827,49 +827,6 @@ dis_mem(addr, len, info)
} }
} }
int
buffer_read_memory(addr, buffer, size, info)
bfd_vma addr;
bfd_byte *buffer;
uint32 size;
struct disassemble_info *info;
{
if (size == sis_memory_read(addr, buffer, size))
return (0);
else
return (1);
}
void
perror_memory(status, addr, info)
int32 status;
bfd_vma addr;
struct disassemble_info *info;
{
printf("Could not read address 0x%08x\n", (unsigned int) addr);
}
void
generic_print_address(addr, info)
bfd_vma addr;
struct disassemble_info *info;
{
printf("0x%x", (unsigned int) addr);
}
/* Just return the given address. */
int
generic_symbol_at_address (addr, info)
bfd_vma addr;
struct disassemble_info * info;
{
return 1;
}
/* Add event to event queue */ /* Add event to event queue */
void void

View File

@ -34,10 +34,6 @@
#include "gdb/remote-sim.h" #include "gdb/remote-sim.h"
#ifndef fprintf
extern fprintf();
#endif
#define PSR_CWP 0x7 #define PSR_CWP 0x7
#define VAL(x) strtol(x,(char **)NULL,0) #define VAL(x) strtol(x,(char **)NULL,0)

View File

@ -33,10 +33,6 @@
#include <dis-asm.h> #include <dis-asm.h>
#include "sim-config.h" #include "sim-config.h"
#ifndef fprintf
extern fprintf();
#endif
#define VAL(x) strtol(x,(char **)NULL,0) #define VAL(x) strtol(x,(char **)NULL,0)
/* Structures and functions from readline library */ /* Structures and functions from readline library */