mirror of http://shamusworld.gotdns.org/git/rmac
One more minor fix: add back FP values for 56001 in d_dc.
This commit is contained in:
parent
29fa5dcf50
commit
1df40a4f5b
55
direct.c
55
direct.c
|
@ -1191,28 +1191,7 @@ int d_dc(WORD siz)
|
||||||
if (eattr & FLOAT)
|
if (eattr & FLOAT)
|
||||||
{
|
{
|
||||||
double fval = *(double *)&eval;
|
double fval = *(double *)&eval;
|
||||||
|
eval = DoubleToDSPFloat(fval);
|
||||||
if (fval >= 1)
|
|
||||||
{
|
|
||||||
warn("value clamped to +1.");
|
|
||||||
eval = 0x7fffff;
|
|
||||||
}
|
|
||||||
else if (fval <= -1)
|
|
||||||
{
|
|
||||||
warn("value clamped to -1.");
|
|
||||||
eval = 0x800000;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Convert fraction to 24 bits fixed point with sign and rounding
|
|
||||||
// Yeah, that cast to int32_t has to be there because casting
|
|
||||||
// a float to unsigned int is "undefined" according to the C
|
|
||||||
// standard. Which most compilers seem to do the sensible thing
|
|
||||||
// and just cast the f**king value properly, except gcc 4.x.x
|
|
||||||
// for arm (tested on raspbian).
|
|
||||||
// Thanks, C and gcc! Thanks for making me waste a few hours \o/
|
|
||||||
eval = 0;//!!! FIX !!! (uint32_t)(int32_t)round(fval*(1 << 23));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1227,10 +1206,11 @@ int d_dc(WORD siz)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// In L: we deposit stuff to both X: and Y: instead
|
// In L: we deposit stuff to both X: and Y: instead
|
||||||
// We will be a bit lazy and require that there is a 2nd value in the same source line.
|
// We will be a bit lazy and require that there is a 2nd value
|
||||||
// (Motorola's assembler can parse 12-digit hex values, which we can't do at the moment)
|
// in the same source line. (Motorola's assembler can parse
|
||||||
// This of course requires to parse 2 values in one pass.
|
// 12-digit hex values, which we can't do at the moment) This
|
||||||
// If there isn't another value in this line, assume X: value is 0.
|
// of course requires to parse 2 values in one pass. If there
|
||||||
|
// isn't another value in this line, assume X: value is 0.
|
||||||
int secondword = 0;
|
int secondword = 0;
|
||||||
uint32_t evaly;
|
uint32_t evaly;
|
||||||
l_parse_loop:
|
l_parse_loop:
|
||||||
|
@ -1245,27 +1225,7 @@ l_parse_loop:
|
||||||
if (eattr & FLOAT)
|
if (eattr & FLOAT)
|
||||||
{
|
{
|
||||||
float fval = *(float *)&eval;
|
float fval = *(float *)&eval;
|
||||||
if (fval >= 1)
|
eval = DoubleToDSPFloat(fval);
|
||||||
{
|
|
||||||
warn("value clamped to +1.");
|
|
||||||
eval = 0x7fffff;
|
|
||||||
}
|
|
||||||
else if (fval <= -1)
|
|
||||||
{
|
|
||||||
warn("value clamped to -1.");
|
|
||||||
eval = 0x800000;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Convert fraction to 24 bits fixed point with sign and rounding
|
|
||||||
// Yeah, that cast to int32_t has to be there because casting
|
|
||||||
// a float to unsigned int is "undefined" according to the C
|
|
||||||
// standard. Which most compilers seem to do the sensible thing
|
|
||||||
// and just cast the f**king value properly, except gcc 4.x.x
|
|
||||||
// for arm (tested on raspbian).
|
|
||||||
// Thanks, C and gcc! Thanks for making me waste a few hours \o/
|
|
||||||
eval = 0;//!!! FIX !!! (uint32_t)(int32_t)round(fval*(1 << 23));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1305,6 +1265,7 @@ l_parse_loop:
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
goto comma;
|
goto comma;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
22
fltpoint.c
22
fltpoint.c
|
@ -15,6 +15,7 @@
|
||||||
#include <float.h>
|
#include <float.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include "error.h"
|
||||||
|
|
||||||
//
|
//
|
||||||
// Check for IEEE-754 conformance (C99 compilers should be OK here)
|
// Check for IEEE-754 conformance (C99 compilers should be OK here)
|
||||||
|
@ -171,6 +172,27 @@ void DoubleToExtended(double d, uint8_t out[])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//
|
||||||
|
// Convert a double to a DSP56001 style fixed point float.
|
||||||
|
// Seems to be 23 bits of float value with 1 bit (MSB) for the sign.
|
||||||
|
//
|
||||||
|
uint32_t DoubleToDSPFloat(double d)
|
||||||
|
{
|
||||||
|
if (d >= 1)
|
||||||
|
{
|
||||||
|
warn("DSP value clamped to +1.");
|
||||||
|
return 0x7FFFFF;
|
||||||
|
}
|
||||||
|
else if (d <= -1)
|
||||||
|
{
|
||||||
|
warn("DSP value clamped to -1.");
|
||||||
|
return 0x800000;
|
||||||
|
}
|
||||||
|
|
||||||
|
return trunc(round(ldexp(d, 23)));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Convert a host native floating point number to a fixed point number.
|
// Convert a host native floating point number to a fixed point number.
|
||||||
//
|
//
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
uint32_t FloatToIEEE754(float f);
|
uint32_t FloatToIEEE754(float f);
|
||||||
uint64_t DoubleToIEEE754(double d);
|
uint64_t DoubleToIEEE754(double d);
|
||||||
void DoubleToExtended(double d, uint8_t out[]);
|
void DoubleToExtended(double d, uint8_t out[]);
|
||||||
|
uint32_t DoubleToDSPFloat(double d);
|
||||||
|
|
||||||
uint64_t DoubleToFixedPoint(double d, int intBits, int fracBits);
|
uint64_t DoubleToFixedPoint(double d, int intBits, int fracBits);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue