Skip to content

Commit

Permalink
Upgrade to KSV version 0.9
Browse files Browse the repository at this point in the history
To do this also requried giving `id`s to all the previously un-exposed
magic numbers in the files, because of
kaitai-io/kaitai_struct#825

This upgrade may perhaps allow us to perform the XOR unmasking in a
language-independent way, although I am having trouble figuring out
how to get the sums in the mask cast to bytes so javac will accept the
resulting code.
  • Loading branch information
brunchboy committed Feb 1, 2021
1 parent d3808a7 commit 453f8aa
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 7 deletions.
9 changes: 7 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<dependency>
<groupId>io.kaitai</groupId>
<artifactId>kaitai-struct-runtime</artifactId>
<version>0.8</version>
<version>0.9</version>
</dependency>

<!-- Remote Tea -->
Expand Down Expand Up @@ -193,6 +193,7 @@
<artifactId>kaitai-maven-plugin</artifactId>
<version>0.1.6</version>
<configuration>
<version>0.9</version>
<sourceDirectory>src/main/kaitai</sourceDirectory>
<packageName>org.deepsymmetry.cratedigger.pdb</packageName>
<overwrite>true</overwrite>
Expand Down Expand Up @@ -247,7 +248,10 @@
</executions>
</plugin>

<!-- The remote tea plugin does not automatically add its own generated sources to the source scope. -->
<!--
The remote tea plugin does not automatically add its own generated sources to the source scope.
It also seems that when compiling with ksc version 0.9, neither does the Kaitai Struct plugin.
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand All @@ -261,6 +265,7 @@
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/remotetea</source>
<source>${project.build.directory}/generated-sources/kaitai</source>
</sources>
</configuration>
</execution>
Expand Down
12 changes: 9 additions & 3 deletions src/main/kaitai/rekordbox_anlz.ksy
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ doc: |
doc-ref: https://reverseengineering.stackexchange.com/questions/4311/help-reversing-a-edb-database-file-for-pioneers-rekordbox-software

seq:
- contents: "PMAI"
- id: magic
contents: "PMAI"
doc: Identifies this as an analysis file.
- id: len_header
type: u4
doc: |
Expand Down Expand Up @@ -149,7 +151,9 @@ types:
doc: |
A cue list entry. Can either represent a memory cue or a loop.
seq:
- contents: "PCPT"
- id: magic
contents: "PCPT"
doc: Identifies this as a cue list entry (cue point).
- id: len_header
type: u4
- id: len_entry
Expand Down Expand Up @@ -218,7 +222,9 @@ types:
A cue extended list entry. Can either describe a memory cue or a
loop.
seq:
- contents: "PCP2"
- id: magic
contents: "PCP2"
doc: Identifies this as an extended cue list entry (cue point).
- id: len_header
type: u4
- id: len_entry
Expand Down
14 changes: 12 additions & 2 deletions src/main/kaitai/rekordbox_pdb.ksy
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,12 @@ seq:
doc: |
@flesniak said: "Always incremented by at least one,
sometimes by two or three."
- contents: [0, 0, 0, 0]
- id: gap
contents: [0, 0, 0, 0]
doc: |
Only exposed until
https://github.com/kaitai-io/kaitai_struct/issues/825 can be
fixed.
- id: tables
type: table
repeat: expr
Expand Down Expand Up @@ -145,7 +150,12 @@ types:
an index which locates all rows present in the heap via their
offsets past the end of the page header.
seq:
- contents: [0, 0, 0, 0]
- id: gap
contents: [0, 0, 0, 0]
doc: |
Only exposed until
https://github.com/kaitai-io/kaitai_struct/issues/825 can be
fixed.
- id: page_index
doc: Matches the index we used to look up the page, sanity check?
type: u4
Expand Down

0 comments on commit 453f8aa

Please sign in to comment.