implement invert

Implement POPC
Merge pull request #1193 from lioncash/priv
2018-08-31 01:55:39 +03:00 · 2018-08-30 10:19:46 +03:00 · 2018-08-28 12:28:57 -04:00 · 2018-08-28 12:28:13 -04:00 · 2018-08-28 12:27:48 -04:00 · 2018-08-28 11:27:44 -04:00
7 changed files with 23 additions and 6 deletions
--- a/src/core/hle/result.h
+++ b/src/core/hle/result.h
@@ -227,7 +227,7 @@ public:
        }
    }

-    ResultVal(ResultVal&& o) : result_code(o.result_code) {
+    ResultVal(ResultVal&& o) noexcept : result_code(o.result_code) {
        if (!o.empty()) {
            new (&object) T(std::move(o.object));
        }
--- a/src/video_core/engines/shader_bytecode.h
+++ b/src/video_core/engines/shader_bytecode.h
@@ -326,6 +326,10 @@ union Instruction {
        BitField<49, 1, u64> negate_a;
    } alu_integer;

+    union {
+        BitField<40, 1, u64> invert;
+    } popc;
+
    union {
        BitField<39, 3, u64> pred;
        BitField<42, 1, u64> neg_pred;
@@ -643,6 +647,9 @@ public:
        ISCADD_C, // Scale and Add
        ISCADD_R,
        ISCADD_IMM,
+        POPC_C,
+        POPC_R,
+        POPC_IMM,
        SEL_C,
        SEL_R,
        SEL_IMM,
@@ -864,6 +871,9 @@ private:
            INST("0100110000011---", Id::ISCADD_C, Type::ArithmeticInteger, "ISCADD_C"),
            INST("0101110000011---", Id::ISCADD_R, Type::ArithmeticInteger, "ISCADD_R"),
            INST("0011100-00011---", Id::ISCADD_IMM, Type::ArithmeticInteger, "ISCADD_IMM"),
+            INST("0100110000001---", Id::POPC_C, Type::ArithmeticInteger, "POPC_C"),
+            INST("0101110000001---", Id::POPC_R, Type::ArithmeticInteger, "POPC_R"),
+            INST("0011100-00001---", Id::POPC_IMM, Type::ArithmeticInteger, "POPC_IMM"),
            INST("0100110010100---", Id::SEL_C, Type::ArithmeticInteger, "SEL_C"),
            INST("0101110010100---", Id::SEL_R, Type::ArithmeticInteger, "SEL_R"),
            INST("0011100-10100---", Id::SEL_IMM, Type::ArithmeticInteger, "SEL_IMM"),
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -211,7 +211,6 @@ std::pair<u8*, GLintptr> RasterizerOpenGL::SetupShaders(u8* buffer_ptr, GLintptr
        buffer_ptr += sizeof(ubo);
        buffer_offset += sizeof(ubo);

-        const Tegra::GPUVAddr addr{gpu.regs.code_address.CodeAddress() + shader_config.offset};
        Shader shader{shader_cache.GetStageProgram(program)};

        switch (program) {
@@ -459,7 +458,6 @@ void RasterizerOpenGL::DrawArrays() {
    // Draw the vertex batch
    const bool is_indexed = accelerate_draw == AccelDraw::Indexed;
    const u64 index_buffer_size{regs.index_array.count * regs.index_array.FormatSizeInBytes()};
-    const unsigned vertex_num{is_indexed ? regs.index_array.count : regs.vertex_buffer.count};

    state.draw.vertex_buffer = stream_buffer.GetHandle();
    state.Apply();
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -14,9 +14,8 @@ namespace OpenGL {
 /// Gets the address for the specified shader stage program
 static Tegra::GPUVAddr GetShaderAddress(Maxwell::ShaderProgram program) {
    auto& gpu = Core::System::GetInstance().GPU().Maxwell3D();
-
-    GLShader::ProgramCode program_code(GLShader::MAX_PROGRAM_CODE_LENGTH);
    auto& shader_config = gpu.regs.shader_config[static_cast<size_t>(program)];
+
    return gpu.regs.code_address.CodeAddress() + shader_config.offset;
 }

--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -1302,6 +1302,15 @@ private:
                                          "((" + op_a + " << " + shift + ") + " + op_b + ')', 1, 1);
                break;
            }
+            case OpCode::Id::POPC_C:
+            case OpCode::Id::POPC_R:
+            case OpCode::Id::POPC_IMM: {
+                if (instr.popc.invert) {
+                    op_b = "~(" + op_b + ')';
+                }
+                regs.SetRegisterToInteger(instr.gpr0, true, 0, "bitCount(" + op_b + ')', 1, 1);
+                break;
+            }
            case OpCode::Id::SEL_C:
            case OpCode::Id::SEL_R:
            case OpCode::Id::SEL_IMM: {
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -893,6 +893,7 @@ void GMainWindow::OnStartGame() {

    ui.action_Pause->setEnabled(true);
    ui.action_Stop->setEnabled(true);
+    ui.action_Restart->setEnabled(true);
 }

 void GMainWindow::OnPauseGame() {
@@ -901,7 +902,6 @@ void GMainWindow::OnPauseGame() {
    ui.action_Start->setEnabled(true);
    ui.action_Pause->setEnabled(false);
    ui.action_Stop->setEnabled(true);
-    ui.action_Restart->setEnabled(true);
 }

 void GMainWindow::OnStopGame() {
--- a/src/yuzu/main.ui
+++ b/src/yuzu/main.ui
@@ -74,6 +74,7 @@
    <addaction name="action_Start"/>
    <addaction name="action_Pause"/>
    <addaction name="action_Stop"/>
+    <addaction name="action_Restart"/>
    <addaction name="separator"/>
    <addaction name="action_Configure"/>
   </widget>
Author	SHA1	Message	Date
Laku	e7487bf220	implement invert	2018-08-31 01:55:39 +03:00
Laku	9683918928	Implement POPC	2018-08-30 10:19:46 +03:00
bunnei	4d7e1662c8	Merge pull request #1193 from lioncash/priv gpu: Make memory_manager private	2018-08-28 12:28:57 -04:00
bunnei	eb4f2d5596	Merge pull request #1192 from lioncash/unused gl_rasterizer: Remove unused variables	2018-08-28 12:28:13 -04:00
bunnei	d8ba202070	Merge pull request #1191 from lioncash/noexcept hle/result: Make ResultVal's move constructor as noexcept	2018-08-28 12:27:48 -04:00
bunnei	72e4499a9e	Merge pull request #1194 from lioncash/alloc gl_shader_cache: Remove unused program_code vector in GetShaderAddress()	2018-08-28 11:27:44 -04:00
Lioncash	2e7dc4cac9	gl_shader_cache: Remove unused program_code vector in GetShaderAddress() Given std::vector is a type with a non-trivial destructor, this variable cannot be optimized away by the compiler, even if unused. Because of that, something that was intended to be fairly lightweight, was actually allocating 32KB and deallocating it at the end of the function.	2018-08-28 11:20:41 -04:00
Lioncash	6771a18c6c	gl_rasterizer: Remove unused variables	2018-08-28 10:46:29 -04:00
bunnei	0d2435343a	Merge pull request #1190 from FearlessTobi/im-so-retarded yuzu: Fix two stupid errors made in #1141	2018-08-28 09:57:05 -04:00
Lioncash	f1bc62bb4c	hle/result: Make ResultVal's move constructor as noexcept Many containers within the standard library provide different behaviors based on whether or not a move constructor/assignment operator can be guaranteed not to throw or not. Notably, implementations will generally use std::move_if_noexcept (or an internal implementation of it) to provide strong exception guarantees. If a move constructor potentially throws (in other words, is not noexcept), then certain behaviors will create copies, rather than moving the values. For example, consider std::vector. When a std::vector calls resize(), there are two ways the elements can be relocated to the new block of memory (if a reallocation happens), by copy, or by moving the existing elements into the new block of memory. If a type does not have a guarantee that it will not throw in the move constructor, a copy will happen. However, if it can be guaranteed that the move constructor won't throw, then the elements will be moved. This just allows ResultVal to be moved instead of copied all the time if ever used in conjunction with containers for whatever reason.	2018-08-28 09:39:50 -04:00
fearlessTobi	4a56931703	Fix two stupid errors made in #1141	2018-08-28 15:16:03 +02:00