mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-07 14:13:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix bug in field lookup (#700)

Browse Source
This commit is contained in:
water111
2021-07-12 19:29:56 -04:00
committed by GitHub
parent 079f623099
commit 73330302ba
4 changed files with 37 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/type_system/TypeFieldLookup.cpp
+8 -8
View File
@@ -231,6 +231,8 @@ void try_reverse_lookup_array_like(const FieldReverseLookupInput& input,
* - get something inside an object (variable idx)
* - get a constant idx reference object (we pick this over just getting the array for idx = 0)
* - get something inside a constant idx reference object
*
* Note: for an inline array of basics, the offset should include the basic offset.
*/
void try_reverse_lookup_inline_array(const FieldReverseLookupInput& input,
const TypeSystem& ts,
@@ -264,7 +266,7 @@ void try_reverse_lookup_inline_array(const FieldReverseLookupInput& input,
FieldReverseLookupInput next_input;
next_input.deref = input.deref;
next_input.stride = 0;
next_input.offset = input.offset;
next_input.offset = input.offset; // includes the offset.
next_input.base_type = di.result_type;
try_reverse_lookup(next_input, ts, &var_idx_node, output, max_count);
return;
@@ -272,18 +274,17 @@ void try_reverse_lookup_inline_array(const FieldReverseLookupInput& input,
// constant lookup, or accessing within the first one
// which element we are in
int elt_idx = input.offset / di.stride;
// how many bytes into the element we look
int elt_idx = (ts.lookup_type(di.result_type)->get_offset() + input.offset) / di.stride;
// how many bytes into the element we look (including offset)
int offset_into_elt = input.offset - (elt_idx * di.stride);
// the expected number of bytes into the element we would look to grab a ref to the elt.
int expected_offset_into_elt = ts.lookup_type(di.result_type)->get_offset();
ReverseLookupNode const_idx_node;
const_idx_node.prev = parent;
const_idx_node.token.kind = FieldReverseLookupOutput::Token::Kind::CONSTANT_IDX;
const_idx_node.token.idx = elt_idx;
if (offset_into_elt == expected_offset_into_elt && !input.deref.has_value()) {
if (offset_into_elt == 0 && !input.deref.has_value()) {
// just get an element (possibly zero, and we want to include the 0 if so)
// for the degenerate inline-array case, it seems more likely that we get the zeroth object
// rather than the array, so this goes before that case.
@@ -295,7 +296,7 @@ void try_reverse_lookup_inline_array(const FieldReverseLookupInput& input,
}
// can we just return the array?
if (expected_offset_into_elt == offset_into_elt && !input.deref.has_value() && elt_idx == 0) {
if (offset_into_elt == 0 && !input.deref.has_value() && elt_idx == 0) {
auto parent_vec = parent_to_vector(parent);
if (!parent_vec.empty()) {
output->results.emplace_back(false, input.base_type, parent_to_vector(parent));
@@ -311,8 +312,7 @@ void try_reverse_lookup_inline_array(const FieldReverseLookupInput& input,
FieldReverseLookupInput next_input;
next_input.deref = input.deref;
next_input.stride = input.stride;
// try_reverse_lookup expects "offset_into_field - boxed_offset"
next_input.offset = offset_into_elt - expected_offset_into_elt;
next_input.offset = offset_into_elt;
next_input.base_type = di.result_type;
try_reverse_lookup(next_input, ts, &const_idx_node, output, max_count);
}
goal_src/engine/gfx/generic/generic.gc
+9 -33
View File
@@ -23,55 +23,37 @@
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 0)
(the-as
generic-dma-foreground-sink
(-> *level* level0 foreground-sink-group 0 merc-sink)
)
(-> *level* level0 foreground-sink-group 0 generic-sink)
)
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 1)
(the-as
generic-dma-foreground-sink
(-> *level* level0 foreground-sink-group 1 merc-sink)
)
(-> *level* level0 foreground-sink-group 1 generic-sink)
)
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 2)
(the-as
generic-dma-foreground-sink
(-> *level* level1 foreground-sink-group 0 merc-sink)
)
(-> *level* level1 foreground-sink-group 0 generic-sink)
)
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 3)
(the-as
generic-dma-foreground-sink
(-> *level* level1 foreground-sink-group 1 merc-sink)
)
(-> *level* level1 foreground-sink-group 1 generic-sink)
)
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 4)
(the-as
generic-dma-foreground-sink
(-> *level* level-default foreground-sink-group 0 merc-sink)
)
(-> *level* level-default foreground-sink-group 0 generic-sink)
)
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 5)
(the-as
generic-dma-foreground-sink
(-> *level* level-default foreground-sink-group 1 merc-sink)
)
(-> *level* level-default foreground-sink-group 1 generic-sink)
)
;; failed to figure out what this is:
@@ -83,19 +65,13 @@
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 7)
(the-as
generic-dma-foreground-sink
(-> *level* level0 foreground-sink-group 2 merc-sink)
)
(-> *level* level0 foreground-sink-group 2 generic-sink)
)
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 8)
(the-as
generic-dma-foreground-sink
(-> *level* level1 foreground-sink-group 2 merc-sink)
)
(-> *level* level1 foreground-sink-group 2 generic-sink)
)
;; definition for function generic-dma-foreground-sink-init
@@ -135,7 +111,7 @@
)
(dma-bucket-insert-tag
(-> *display* frames (-> *display* on-screen) frame bucket-group)
(the bucket-id s3-0) ;; TODO, correct types here
(the-as bucket-id s3-0)
s2-0
(the-as (pointer dma-tag) a3-0)
)
test/decompiler/reference/engine/gfx/generic/generic_REF.gc
+8 -32
View File
@@ -16,55 +16,37 @@
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 0)
(the-as
generic-dma-foreground-sink
(-> *level* level0 foreground-sink-group 0 merc-sink)
)
(-> *level* level0 foreground-sink-group 0 generic-sink)
)
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 1)
(the-as
generic-dma-foreground-sink
(-> *level* level0 foreground-sink-group 1 merc-sink)
)
(-> *level* level0 foreground-sink-group 1 generic-sink)
)
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 2)
(the-as
generic-dma-foreground-sink
(-> *level* level1 foreground-sink-group 0 merc-sink)
)
(-> *level* level1 foreground-sink-group 0 generic-sink)
)
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 3)
(the-as
generic-dma-foreground-sink
(-> *level* level1 foreground-sink-group 1 merc-sink)
)
(-> *level* level1 foreground-sink-group 1 generic-sink)
)
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 4)
(the-as
generic-dma-foreground-sink
(-> *level* level-default foreground-sink-group 0 merc-sink)
)
(-> *level* level-default foreground-sink-group 0 generic-sink)
)
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 5)
(the-as
generic-dma-foreground-sink
(-> *level* level-default foreground-sink-group 1 merc-sink)
)
(-> *level* level-default foreground-sink-group 1 generic-sink)
)
;; failed to figure out what this is:
@@ -76,19 +58,13 @@
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 7)
(the-as
generic-dma-foreground-sink
(-> *level* level0 foreground-sink-group 2 merc-sink)
)
(-> *level* level0 foreground-sink-group 2 generic-sink)
)
;; failed to figure out what this is:
(set!
(-> *generic-foreground-sinks* 8)
(the-as
generic-dma-foreground-sink
(-> *level* level1 foreground-sink-group 2 merc-sink)
)
(-> *level* level1 foreground-sink-group 2 generic-sink)
)
;; definition for function generic-dma-foreground-sink-init
test/decompiler/test_DataParser.cpp
+12
View File
@@ -390,3 +390,15 @@ TEST_F(DataDecompTest, KernelContext) {
" :relocating-process #f\n"
" :low-memory-message #t)\n");
}
TEST_F(DataDecompTest, ReverseArtExt) {
FieldReverseLookupInput input;
input.base_type = TypeSpec("external-art-control");
input.offset = 124;
auto result = dts->ts.reverse_field_multi_lookup(input);
EXPECT_EQ(result.results.at(0).tokens.at(2).print(), "name");
input.offset = 108;
result = dts->ts.reverse_field_multi_lookup(input);
EXPECT_EQ(result.results.at(0).tokens.at(2).print(), "type");
}