zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 15:22:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prioritize single->double conversions for FindBestProto()

Browse source 
- The binary form of ZCC_OpInfoType::FindBestProto() needs special
  handling for conversion from single to double precision floating point
  so that it doesn't choose an integer form over a floating point form
  when picking the best prototype.
This commit is contained in:
Randy Heit 2013-11-01 22:05:49 -05:00
parent 3063df4f74
commit ec6624dfc7
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/zscript/zcc_expr.cpp
View file

@ -10,6 +10,8 @@
#define luai_nummod(a,b) ((a) - floor((a)/(b))*(b)) #define luai_nummod(a,b) ((a) - floor((a)/(b))*(b))
static void FtoD(ZCC_ExprConstant *expr, FSharedStringArena &str_arena);
ZCC_OpInfoType ZCC_OpInfo[PEX_COUNT_OF] = ZCC_OpInfoType ZCC_OpInfo[PEX_COUNT_OF] =
{ {
#define xx(a,z) { #a, NULL }, #define xx(a,z) { #a, NULL },
@ -134,7 +136,19 @@ ZCC_OpProto *ZCC_OpInfoType::FindBestProto(
{ // one or both operator types are unreachable { // one or both operator types are unreachable
continue; continue;
} }
int dist = MIN(dist1, dist2); // Do not count F32->F64 conversions in the distance comparisons. If we do, then
// [[float32 (op) int]] will choose the integer version instead of the floating point
// version, which we do not want.
int test_dist1 = dist1, test_dist2 = dist2;
if (routes[0][cur_route1][0]->ConvertConstant == FtoD)
{
test_dist1--;
}
if (routes[1][cur_route2][0]->ConvertConstant == FtoD)
{
test_dist2--;
}
int dist = MIN(test_dist1, test_dist2);
if (dist < best_low_dist) if (dist < best_low_dist)
{ {
best_low_dist = dist; best_low_dist = dist;