Merge from Pandora (26 Sept 2016)

This commit is contained in:
Dimitris Panokostas 2016-11-30 22:25:43 +01:00
parent 7b89bfb04a
commit 13df0bcfa8
105 changed files with 219753 additions and 294921 deletions

File diff suppressed because it is too large Load diff

View file

@ -14,9 +14,9 @@
#include "sysdeps.h"
#include "options.h"
#include "include/memory.h"
#include "newcpu.h"
#include "memory.h"
#include "custom.h"
#include "newcpu.h"
#include "ersatz.h"
#include "compemu.h"
@ -24,8 +24,7 @@
uae_u32 temp_fp[] = {0,0,0}; /* To convert between FP and <EA> */
/* 128 words, indexed through the low byte of the 68k fpu control word */
static const uae_u16 x86_fpucw[]=
{
static const uae_u16 x86_fpucw[]={
0x137f, 0x137f, 0x137f, 0x137f, 0x137f, 0x137f, 0x137f, 0x137f, /* E-RN */
0x1f7f, 0x1f7f, 0x1f7f, 0x1f7f, 0x1f7f, 0x1f7f, 0x1f7f, 0x1f7f, /* E-RZ */
0x177f, 0x177f, 0x177f, 0x177f, 0x177f, 0x177f, 0x177f, 0x177f, /* E-RD */
@ -52,56 +51,56 @@ static const int sz2[8] = { 4, 4, 12, 12, 2, 8, 2, 0 };
/* return the required floating point precision or -1 for failure, 0=E, 1=S, 2=D */
STATIC_INLINE int comp_fp_get (uae_u32 opcode, uae_u16 extra, int treg)
{
printf("comp_fp_get not yet implemented\n");
return -1;
printf("comp_fp_get not yet implemented\n");
return -1;
}
/* return of -1 means failure, >=0 means OK */
STATIC_INLINE int comp_fp_put (uae_u32 opcode, uae_u16 extra)
{
printf("comp_fp_put not yet implemented\n");
return -1;
printf("comp_fp_put not yet implemented\n");
return -1;
}
/* return -1 for failure, or register number for success */
STATIC_INLINE int comp_fp_adr (uae_u32 opcode)
{
printf("comp_fp_adr not yet implemented\n");
return -1;
printf("comp_fp_adr not yet implemented\n");
return -1;
}
void comp_fdbcc_opp (uae_u32 opcode, uae_u16 extra)
{
printf("comp_fdbcc_opp not yet implemented\n");
printf("comp_fdbcc_opp not yet implemented\n");
}
void comp_fscc_opp (uae_u32 opcode, uae_u16 extra)
{
printf("comp_fscc_opp not yet implemented\n");
printf("comp_fscc_opp not yet implemented\n");
}
void comp_ftrapcc_opp (uae_u32 opcode, uaecptr oldpc)
{
printf("comp_ftrapcc_opp not yet implemented\n");
printf("comp_ftrapcc_opp not yet implemented\n");
}
void comp_fbcc_opp (uae_u32 opcode)
{
printf("comp_fbcc_opp not yet implemented\n");
printf("comp_fbcc_opp not yet implemented\n");
}
void comp_fsave_opp (uae_u32 opcode)
{
printf("comp_fsave_opp not yet implemented\n");
printf("comp_fsave_opp not yet implemented\n");
}
void comp_frestore_opp (uae_u32 opcode)
{
printf("comp_frestore_opp not yet implemented\n");
printf("comp_frestore_opp not yet implemented\n");
}
void comp_fpp_opp (uae_u32 opcode, uae_u16 extra)
{
printf("comp_fpp_opp not yet implemented\n");
printf("comp_fpp_opp not yet implemented\n");
}
#endif

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -147,7 +147,6 @@ extern compop_func op_838_0_comp_ff;
extern compop_func op_839_0_comp_ff;
extern compop_func op_83a_0_comp_ff;
extern compop_func op_83b_0_comp_ff;
extern compop_func op_83c_0_comp_ff;
extern compop_func op_840_0_comp_ff;
extern compop_func op_850_0_comp_ff;
extern compop_func op_858_0_comp_ff;
@ -668,7 +667,6 @@ extern compop_func op_4a38_0_comp_ff;
extern compop_func op_4a39_0_comp_ff;
extern compop_func op_4a3a_0_comp_ff;
extern compop_func op_4a3b_0_comp_ff;
extern compop_func op_4a3c_0_comp_ff;
extern compop_func op_4a40_0_comp_ff;
extern compop_func op_4a48_0_comp_ff;
extern compop_func op_4a50_0_comp_ff;
@ -680,7 +678,6 @@ extern compop_func op_4a78_0_comp_ff;
extern compop_func op_4a79_0_comp_ff;
extern compop_func op_4a7a_0_comp_ff;
extern compop_func op_4a7b_0_comp_ff;
extern compop_func op_4a7c_0_comp_ff;
extern compop_func op_4a80_0_comp_ff;
extern compop_func op_4a88_0_comp_ff;
extern compop_func op_4a90_0_comp_ff;
@ -692,7 +689,6 @@ extern compop_func op_4ab8_0_comp_ff;
extern compop_func op_4ab9_0_comp_ff;
extern compop_func op_4aba_0_comp_ff;
extern compop_func op_4abb_0_comp_ff;
extern compop_func op_4abc_0_comp_ff;
extern compop_func op_4c00_0_comp_ff;
extern compop_func op_4c10_0_comp_ff;
extern compop_func op_4c18_0_comp_ff;
@ -1595,7 +1591,6 @@ extern compop_func op_838_0_comp_nf;
extern compop_func op_839_0_comp_nf;
extern compop_func op_83a_0_comp_nf;
extern compop_func op_83b_0_comp_nf;
extern compop_func op_83c_0_comp_nf;
extern compop_func op_840_0_comp_nf;
extern compop_func op_850_0_comp_nf;
extern compop_func op_858_0_comp_nf;
@ -2116,7 +2111,6 @@ extern compop_func op_4a38_0_comp_nf;
extern compop_func op_4a39_0_comp_nf;
extern compop_func op_4a3a_0_comp_nf;
extern compop_func op_4a3b_0_comp_nf;
extern compop_func op_4a3c_0_comp_nf;
extern compop_func op_4a40_0_comp_nf;
extern compop_func op_4a48_0_comp_nf;
extern compop_func op_4a50_0_comp_nf;
@ -2128,7 +2122,6 @@ extern compop_func op_4a78_0_comp_nf;
extern compop_func op_4a79_0_comp_nf;
extern compop_func op_4a7a_0_comp_nf;
extern compop_func op_4a7b_0_comp_nf;
extern compop_func op_4a7c_0_comp_nf;
extern compop_func op_4a80_0_comp_nf;
extern compop_func op_4a88_0_comp_nf;
extern compop_func op_4a90_0_comp_nf;
@ -2140,7 +2133,6 @@ extern compop_func op_4ab8_0_comp_nf;
extern compop_func op_4ab9_0_comp_nf;
extern compop_func op_4aba_0_comp_nf;
extern compop_func op_4abb_0_comp_nf;
extern compop_func op_4abc_0_comp_nf;
extern compop_func op_4c00_0_comp_nf;
extern compop_func op_4c10_0_comp_nf;
extern compop_func op_4c18_0_comp_nf;

File diff suppressed because it is too large Load diff