scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor compression copy commands

Browse Source
This commit is contained in:
Justin Scofield
2022-07-29 21:13:31 +00:00
parent 14f99a15ba
commit 1ec6585fdb
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/rom.cc
View File

@@ -369,21 +369,22 @@ void CompressionCommandAlternative(
auto new_comp_piece = NewCompressionPiece(cmd_with_max, max_win, buffer, auto new_comp_piece = NewCompressionPiece(cmd_with_max, max_win, buffer,
cmd_size[cmd_with_max]); cmd_size[cmd_with_max]);
PrintCompressionPiece(new_comp_piece); PrintCompressionPiece(new_comp_piece);
// If we let non compressed stuff, we need to add a copy chuck before // If we let non compressed stuff, we need to add a copy chunk before
if (bytes_since_last_compression != 0) { if (bytes_since_last_compression != 0) {
std::string copy_buff; std::string copy_buff;
copy_buff.resize(bytes_since_last_compression); copy_buff.resize(bytes_since_last_compression);
for (int i = 0; i < bytes_since_last_compression; ++i) { for (int i = 0; i < bytes_since_last_compression; ++i) {
copy_buff[i] = rom_data[i + u_data_pos - bytes_since_last_compression]; copy_buff[i] = rom_data[i + u_data_pos - bytes_since_last_compression];
} }
auto copy_chuck = auto copy_chunk =
NewCompressionPiece(kCommandDirectCopy, bytes_since_last_compression, NewCompressionPiece(kCommandDirectCopy, bytes_since_last_compression,
copy_buff, bytes_since_last_compression); copy_buff, bytes_since_last_compression);
compressed_chain->next = copy_chuck; compressed_chain->next = copy_chunk;
compressed_chain = copy_chuck; compressed_chain = copy_chunk;
} else {
compressed_chain->next = new_comp_piece;
compressed_chain = new_comp_piece;
} }
compressed_chain->next = new_comp_piece;
compressed_chain = new_comp_piece;
u_data_pos += max_win; u_data_pos += max_win;
bytes_since_last_compression = 0; bytes_since_last_compression = 0;
} }
@@ -445,6 +446,7 @@ absl::StatusOr<Bytes> ROM::Compress(const int start, const int length,
if (!decomp_response.ok()) { if (!decomp_response.ok()) {
return decomp_response.status(); return decomp_response.status();
} }
auto decomp_data = std::move(*decomp_response); auto decomp_data = std::move(*decomp_response);
if (!std::equal(decomp_data.begin() + start, decomp_data.end(), if (!std::equal(decomp_data.begin() + start, decomp_data.end(),
temp_rom.begin())) { temp_rom.begin())) {
@@ -475,7 +477,7 @@ absl::StatusOr<Bytes> ROM::CompressOverworld(const int pos, const int length) {
} }
absl::StatusOr<Bytes> ROM::Decompress(int offset, int size, bool reversed) { absl::StatusOr<Bytes> ROM::Decompress(int offset, int size, bool reversed) {
Bytes buffer(size); Bytes buffer(size, 0);
uint length = 0; uint length = 0;
uint buffer_pos = 0; uint buffer_pos = 0;
uchar cmd = 0; uchar cmd = 0;
@@ -485,7 +487,7 @@ absl::StatusOr<Bytes> ROM::Decompress(int offset, int size, bool reversed) {
if ((databyte & 0xE0) == 0xE0) { // Expanded Command if ((databyte & 0xE0) == 0xE0) { // Expanded Command
cmd = ((databyte >> 2) & 0x07); cmd = ((databyte >> 2) & 0x07);
length = (((rom_data_[offset] << 8) | rom_data_[offset + 1]) & 0x3FF); length = (((databyte << 8) | rom_data_[offset + 1]) & 0x3FF);
offset += 2; // Advance 2 bytes in ROM offset += 2; // Advance 2 bytes in ROM
} else { // Normal Command } else { // Normal Command
cmd = ((databyte >> 5) & 0x07); cmd = ((databyte >> 5) & 0x07);