ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #411 from lioncash/fifo-cleanup 

Make GetBPRegInfo just take two strings as parameters
This commit is contained in:
Pierre Bourdon 2014-05-30 01:51:11 +02:00
parent 7c09f07f36 c96407bd2a
commit 3097345929
3 changed files with 91 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinWX/FifoPlayerDlg.cpp
View File

@ -789,16 +789,18 @@ void FifoPlayerDlg::OnObjectCmdListSelectionChanged(wxCommandEvent& event)
wxString newLabel; wxString newLabel;
if (*cmddata == GX_LOAD_BP_REG) if (*cmddata == GX_LOAD_BP_REG)
{ {
char name[64]="\0", desc[512]="\0"; std::string name;
GetBPRegInfo(cmddata+1, name, sizeof(name), desc, sizeof(desc)); std::string desc;
GetBPRegInfo(cmddata+1, &name, &desc);
newLabel = _("BP register "); newLabel = _("BP register ");
newLabel += (name[0] != '\0') ? StrToWxStr(name) : wxString::Format(_("UNKNOWN_%02X"), *(cmddata+1)); newLabel += (name.empty()) ? wxString::Format(_("UNKNOWN_%02X"), *(cmddata+1)) : StrToWxStr(name);
newLabel += ":\n"; newLabel += ":\n";
if (desc[0] != '\0') if (desc.empty())
newLabel += StrToWxStr(desc);
else
newLabel += _("No description available"); newLabel += _("No description available");
else
newLabel += StrToWxStr(desc);
} }
else if (*cmddata == GX_LOAD_CP_REG) else if (*cmddata == GX_LOAD_CP_REG)
{ {

4
Source/Core/VideoCommon/BPMemory.h
View File

@ -4,6 +4,8 @@
#pragma once #pragma once
#include <string>
#include "Common/BitField.h" #include "Common/BitField.h"
#include "Common/Common.h" #include "Common/Common.h"
@ -1081,4 +1083,4 @@ extern BPMemory bpmem;
void LoadBPReg(u32 value0); void LoadBPReg(u32 value0);
void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size_t desc_size); void GetBPRegInfo(const u8* data, std::string* name, std::string* desc);

61
Source/Core/VideoCommon/BPStructs.cpp
View File

@ -4,6 +4,7 @@
#include <cmath> #include <cmath>
#include "Common/StringUtil.h"
#include "Common/Thread.h" #include "Common/Thread.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
@ -658,7 +659,7 @@ void LoadBPReg(u32 value0)
BPWritten(bp); BPWritten(bp);
} }
void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size_t desc_size) void GetBPRegInfo(const u8* data, std::string* name, std::string* desc)
{ {
const char* no_yes[2] = { "No", "Yes" }; const char* no_yes[2] = { "No", "Yes" };
@ -667,7 +668,7 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size
{ {
// Macro to set the register name and make sure it was written correctly via compile time assertion // Macro to set the register name and make sure it was written correctly via compile time assertion
#define SetRegName(reg) \ #define SetRegName(reg) \
snprintf(name, name_size, #reg); \ *name = #reg; \
(void)(reg); (void)(reg);
case BPMEM_GENMODE: // 0x00 case BPMEM_GENMODE: // 0x00
@ -691,7 +692,7 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size
{ {
SetRegName(BPMEM_EFB_TL); SetRegName(BPMEM_EFB_TL);
X10Y10 left_top; left_top.hex = cmddata; X10Y10 left_top; left_top.hex = cmddata;
snprintf(desc, desc_size, "Left: %d\nTop: %d", left_top.x, left_top.y); *desc = StringFromFormat("Left: %d\nTop: %d", left_top.x, left_top.y);
} }
break; break;
@ -702,7 +703,7 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size
const char* dstfactors[] = { "0", "1", "src_color", "1-src_color", "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha" }; const char* dstfactors[] = { "0", "1", "src_color", "1-src_color", "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha" };
const char* srcfactors[] = { "0", "1", "dst_color", "1-dst_color", "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha" }; const char* srcfactors[] = { "0", "1", "dst_color", "1-dst_color", "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha" };
const char* logicmodes[] = { "0", "s & d", "s & ~d", "s", "~s & d", "d", "s ^ d", "s | d", "~(s | d)", "~(s ^ d)", "~d", "s | ~d", "~s", "~s | d", "~(s & d)", "1" }; const char* logicmodes[] = { "0", "s & d", "s & ~d", "s", "~s & d", "d", "s ^ d", "s | d", "~(s | d)", "~(s ^ d)", "~d", "s | ~d", "~s", "~s | d", "~(s & d)", "1" };
snprintf(desc, desc_size, "Enable: %s\n" *desc = StringFromFormat("Enable: %s\n"
"Logic ops: %s\n" "Logic ops: %s\n"
"Dither: %s\n" "Dither: %s\n"
"Color write: %s\n" "Color write: %s\n"
@ -723,7 +724,7 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size
PEControl config; config.hex = cmddata; PEControl config; config.hex = cmddata;
const char* pixel_formats[] = { "RGB8_Z24", "RGBA6_Z24", "RGB565_Z16", "Z24", "Y8", "U8", "V8", "YUV420" }; const char* pixel_formats[] = { "RGB8_Z24", "RGBA6_Z24", "RGB565_Z16", "Z24", "Y8", "U8", "V8", "YUV420" };
const char* zformats[] = { "linear", "compressed (near)", "compressed (mid)", "compressed (far)", "inv linear", "compressed (inv near)", "compressed (inv mid)", "compressed (inv far)" }; const char* zformats[] = { "linear", "compressed (near)", "compressed (mid)", "compressed (far)", "inv linear", "compressed (inv near)", "compressed (inv mid)", "compressed (inv far)" };
snprintf(desc, desc_size, "EFB pixel format: %s\n" *desc = StringFromFormat("EFB pixel format: %s\n"
"Depth format: %s\n" "Depth format: %s\n"
"Early depth test: %s\n", "Early depth test: %s\n",
pixel_formats[config.pixel_format], zformats[config.zformat], no_yes[config.early_ztest]); pixel_formats[config.pixel_format], zformats[config.zformat], no_yes[config.early_ztest]);
@ -735,40 +736,40 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size
// TODO: Misleading name, should be BPMEM_EFB_WH instead // TODO: Misleading name, should be BPMEM_EFB_WH instead
SetRegName(BPMEM_EFB_BR); SetRegName(BPMEM_EFB_BR);
X10Y10 width_height; width_height.hex = cmddata; X10Y10 width_height; width_height.hex = cmddata;
snprintf(desc, desc_size, "Width: %d\nHeight: %d", width_height.x+1, width_height.y+1); *desc = StringFromFormat("Width: %d\nHeight: %d", width_height.x+1, width_height.y+1);
} }
break; break;
case BPMEM_EFB_ADDR: // 0x4B case BPMEM_EFB_ADDR: // 0x4B
SetRegName(BPMEM_EFB_ADDR); SetRegName(BPMEM_EFB_ADDR);
snprintf(desc, desc_size, "Target address (32 byte aligned): 0x%06X", cmddata << 5); *desc = StringFromFormat("Target address (32 byte aligned): 0x%06X", cmddata << 5);
break; break;
case BPMEM_COPYYSCALE: // 0x4E case BPMEM_COPYYSCALE: // 0x4E
SetRegName(BPMEM_COPYYSCALE); SetRegName(BPMEM_COPYYSCALE);
snprintf(desc, desc_size, "Scaling factor (XFB copy only): 0x%X (%f or inverted %f)", cmddata, (float)cmddata/256.f, 256.f/(float)cmddata); *desc = StringFromFormat("Scaling factor (XFB copy only): 0x%X (%f or inverted %f)", cmddata, (float)cmddata/256.f, 256.f/(float)cmddata);
break; break;
case BPMEM_CLEAR_AR: // 0x4F case BPMEM_CLEAR_AR: // 0x4F
SetRegName(BPMEM_CLEAR_AR); SetRegName(BPMEM_CLEAR_AR);
snprintf(desc, desc_size, "Alpha: 0x%02X\nRed: 0x%02X", (cmddata&0xFF00)>>8, cmddata&0xFF); *desc = StringFromFormat("Alpha: 0x%02X\nRed: 0x%02X", (cmddata&0xFF00)>>8, cmddata&0xFF);
break; break;
case BPMEM_CLEAR_GB: // 0x50 case BPMEM_CLEAR_GB: // 0x50
SetRegName(BPMEM_CLEAR_GB); SetRegName(BPMEM_CLEAR_GB);
snprintf(desc, desc_size, "Green: 0x%02X\nBlue: 0x%02X", (cmddata&0xFF00)>>8, cmddata&0xFF); *desc = StringFromFormat("Green: 0x%02X\nBlue: 0x%02X", (cmddata&0xFF00)>>8, cmddata&0xFF);
break; break;
case BPMEM_CLEAR_Z: // 0x51 case BPMEM_CLEAR_Z: // 0x51
SetRegName(BPMEM_CLEAR_Z); SetRegName(BPMEM_CLEAR_Z);
snprintf(desc, desc_size, "Z value: 0x%06X", cmddata); *desc = StringFromFormat("Z value: 0x%06X", cmddata);
break; break;
case BPMEM_TRIGGER_EFB_COPY: // 0x52 case BPMEM_TRIGGER_EFB_COPY: // 0x52
{ {
SetRegName(BPMEM_TRIGGER_EFB_COPY); SetRegName(BPMEM_TRIGGER_EFB_COPY);
UPE_Copy copy; copy.Hex = cmddata; UPE_Copy copy; copy.Hex = cmddata;
snprintf(desc, desc_size, "Clamping: %s\n" *desc = StringFromFormat("Clamping: %s\n"
"Converting from RGB to YUV: %s\n" "Converting from RGB to YUV: %s\n"
"Target pixel format: 0x%X\n" "Target pixel format: 0x%X\n"
"Gamma correction: %s\n" "Gamma correction: %s\n"
@ -814,7 +815,7 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size
{ {
SetRegName(BPMEM_TX_SETIMAGE3); SetRegName(BPMEM_TX_SETIMAGE3);
TexImage3 teximg; teximg.hex = cmddata; TexImage3 teximg; teximg.hex = cmddata;
snprintf(desc, desc_size, "Source address (32 byte aligned): 0x%06X", teximg.image_base << 5); *desc = StringFromFormat("Source address (32 byte aligned): 0x%06X", teximg.image_base << 5);
} }
break; break;
@ -850,16 +851,16 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size
const char* tevop[] = { "add", "sub" }; const char* tevop[] = { "add", "sub" };
const char* tevscale[] = { "1", "2", "4", "0.5" }; const char* tevscale[] = { "1", "2", "4", "0.5" };
const char* tevout[] = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" }; const char* tevout[] = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" };
snprintf(desc, desc_size, "tev stage: %d\n" *desc = StringFromFormat("Tev stage: %d\n"
"a: %s\n" "a: %s\n"
"b: %s\n" "b: %s\n"
"c: %s\n" "c: %s\n"
"d: %s\n" "d: %s\n"
"bias: %s\n" "Bias: %s\n"
"op: %s\n" "Op: %s\n"
"clamp: %s\n" "Clamp: %s\n"
"scale factor: %s\n" "Scale factor: %s\n"
"dest: %s\n", "Dest: %s\n",
(data[0] - BPMEM_TEV_COLOR_ENV)/2, tevin[cc.a], tevin[cc.b], tevin[cc.c], tevin[cc.d], (data[0] - BPMEM_TEV_COLOR_ENV)/2, tevin[cc.a], tevin[cc.b], tevin[cc.c], tevin[cc.d],
tevbias[cc.bias], tevop[cc.op], no_yes[cc.clamp], tevscale[cc.shift], tevout[cc.dest]); tevbias[cc.bias], tevop[cc.op], no_yes[cc.clamp], tevscale[cc.shift], tevout[cc.dest]);
break; break;
@ -893,18 +894,18 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size
const char* tevop[] = { "add", "sub" }; const char* tevop[] = { "add", "sub" };
const char* tevscale[] = { "1", "2", "4", "0.5" }; const char* tevscale[] = { "1", "2", "4", "0.5" };
const char* tevout[] = { "prev", "c0", "c1", "c2" }; const char* tevout[] = { "prev", "c0", "c1", "c2" };
snprintf(desc, desc_size, "tev stage: %d\n" *desc = StringFromFormat("Tev stage: %d\n"
"a: %s\n" "a: %s\n"
"b: %s\n" "b: %s\n"
"c: %s\n" "c: %s\n"
"d: %s\n" "d: %s\n"
"bias: %s\n" "Bias: %s\n"
"op: %s\n" "Op: %s\n"
"clamp: %s\n" "Clamp: %s\n"
"scale factor: %s\n" "Scale factor: %s\n"
"dest: %s\n" "Dest: %s\n"
"ras sel: %d\n" "Ras sel: %d\n"
"tex sel: %d\n", "Tex sel: %d\n",
(data[0] - BPMEM_TEV_ALPHA_ENV)/2, tevin[ac.a], tevin[ac.b], tevin[ac.c], tevin[ac.d], (data[0] - BPMEM_TEV_ALPHA_ENV)/2, tevin[ac.a], tevin[ac.b], tevin[ac.c], tevin[ac.d],
tevbias[ac.bias], tevop[ac.op], no_yes[ac.clamp], tevscale[ac.shift], tevout[ac.dest], tevbias[ac.bias], tevop[ac.op], no_yes[ac.clamp], tevscale[ac.shift], tevout[ac.dest],
ac.rswap, ac.tswap); ac.rswap, ac.tswap);
@ -917,9 +918,9 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size
AlphaTest test; test.hex = cmddata; AlphaTest test; test.hex = cmddata;
const char* functions[] = { "NEVER", "LESS", "EQUAL", "LEQUAL", "GREATER", "NEQUAL", "GEQUAL", "ALWAYS" }; const char* functions[] = { "NEVER", "LESS", "EQUAL", "LEQUAL", "GREATER", "NEQUAL", "GEQUAL", "ALWAYS" };
const char* logic[] = { "AND", "OR", "XOR", "XNOR" }; const char* logic[] = { "AND", "OR", "XOR", "XNOR" };
snprintf(desc, desc_size, "test 1: %s (ref: %#02x)\n" *desc = StringFromFormat("Test 1: %s (ref: %#02x)\n"
"test 2: %s (ref: %#02x)\n" "Test 2: %s (ref: %#02x)\n"
"logic: %s\n", "Logic: %s\n",
functions[test.comp0], (int)test.ref0, functions[test.comp1], (int)test.ref1, logic[test.logic]); functions[test.comp0], (int)test.ref0, functions[test.comp1], (int)test.ref1, logic[test.logic]);
break; break;
} }