RPCS3/archived-rsx-program-decompiler
1
0
Fork 0
mirror of https://github.com/RPCS3/rsx_program_decompiler.git synced 2026-01-31 01:25:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed make_not_zero methods

Browse Source
This commit is contained in:
DH
2016-07-04 21:07:39 +03:00
parent 58805ef0f6
commit f60a9d0aa7
2 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
rsx_decompiler/rsx_fp_decompiler.cpp
View File

@@ -2,6 +2,7 @@
#include "rsx_fp_ucode.h"
#include <glsl_language.h>
#include <map>
#include <algorithm>
#include "../rsx_program_decompiler/endianness.h"
namespace rsx
@@ -33,6 +34,14 @@ namespace rsx
template<int Count>
using integer_t = typename base::template integer_t<Count>;
using type_class_t = typename base::type_class_t;
template<type_class_t Type, int Count>
using expression_t = typename base::template expression_t<Type, Count>;
template<type_class_t Type, int Count>
using type_t = typename base::template type_t<Type, Count>;
struct context_t
{
decompiled_shader program;
@@ -436,7 +445,8 @@ namespace rsx
return arg;
}
builder::writer_t set_dst(const float_point_expr<4>& arg, u32 flags = none)
template<int Count, typename = std::enable_if_t<(Count > 1)>>
builder::writer_t set_dst(expression_t<type_class_t::type_float, Count> arg, u32 flags = none)
{
builder::writer_t result;
@@ -576,9 +586,10 @@ namespace rsx
}
}
builder::writer_t set_dst(const integer_expr<1>& arg, u32 flags = none)
template<int Count>
builder::writer_t set_dst(const expression_t<type_class_t::type_int, Count>& arg, u32 flags = none)
{
return set_dst(float_point_t<1>::ctor(arg), flags);
return set_dst(float_point_t<Count>::ctor(arg), flags);
}
builder::writer_t set_dst(const boolean_expr<4>& arg, u32 flags = none)
@@ -601,10 +612,23 @@ namespace rsx
return set_dst(float_point_expr<4>{ arg_string, std::string("xyzw"), is_single, 4 }, flags);
}
template<typename Type>
Type make_not_zero(Type arg)
template<type_class_t Type, int Count>
expression_t<Type, Count> make_not_zero(const expression_t<Type, Count> &arg)
{
return base::max(base::abs(arg), float_point_t<Type::type::count>::ctor(1e-15f)) * base::sign(arg);
std::string expr = "1e-15";
switch (std::min<int>(Count, instruction.destination_swizzle().size()))
{
case 1: break;
case 2: expr = float_point_t<2>::ctor(boolean_expr<2>{ expr }).to_string(); break;
case 3: expr = float_point_t<3>::ctor(boolean_expr<3>{ expr }).to_string(); break;
case 4: expr = float_point_t<4>::ctor(boolean_expr<4>{ expr }).to_string(); break;
default:
throw std::logic_error("bad destination swizzle.");
}
return base::max(base::abs(arg), expression_t<Type, Count>{ expr }) * base::sign(arg);
}
builder::expression_base_t decode_instruction()

31
rsx_decompiler/rsx_vp_decompiler.cpp
View File

@@ -2,6 +2,7 @@
#include <glsl_language.h>
#include "rsx_decompiler_base.h"
#include <map>
#include <algorithm>
namespace rsx
{
@@ -32,6 +33,14 @@ namespace rsx
template<int Count>
using integer_t = typename base::template integer_t<Count>;
using type_class_t = typename base::type_class_t;
template<type_class_t Type, int Count>
using expression_t = typename base::template expression_t<Type, Count>;
template<type_class_t Type, int Count>
using type_t = typename base::template type_t<Type, Count>;
struct context_t
{
decompiled_shader program;
@@ -348,7 +357,8 @@ namespace rsx
never = 0
};
typename base::writer_t set_dst(float_point_expr<4> arg)
template<int Count, typename = std::enable_if_t<(Count > 1)>>
typename base::writer_t set_dst(expression_t<type_class_t::type_float, Count> arg)
{
auto dst_pair = destination_register();
bool has_dst = dst_pair.first;
@@ -562,10 +572,23 @@ namespace rsx
return expr;
}
template<typename Type>
Type make_not_zero(Type arg)
template<type_class_t Type, int Count>
expression_t<Type, Count> make_not_zero(const expression_t<Type, Count> &arg)
{
return base::max(base::abs(arg), float_point_t<Type::type::count>::ctor(1e-15f)) * base::sign(arg);
std::string expr = "1e-15";
switch (std::min<int>(Count, destination_swizzle().size()))
{
case 1: break;
case 2: expr = float_point_t<2>::ctor(boolean_expr<2>{ expr }).to_string(); break;
case 3: expr = float_point_t<3>::ctor(boolean_expr<3>{ expr }).to_string(); break;
case 4: expr = float_point_t<4>::ctor(boolean_expr<4>{ expr }).to_string(); break;
default:
throw std::logic_error("bad destination swizzle.");
}
return base::max(base::abs(arg), expression_t<Type, Count>{ expr }) * base::sign(arg);
}
typename base::expression_base_t decode_sca_instruction()