Zorchenhimer
/
go-studybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[script] Tweak CDL caching 

Reworked the CDL caching to properly handle unknown bytes in scripts.
This commit is contained in:
Zorchenhimer 2025-10-26 18:33:10 -04:00
parent 63de05e9dd
commit 37711fa4bb
Signed by: Zorchenhimer
GPG Key ID: 70A1AB767AAB9C20
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
script/cdl.go
View File

@ -7,6 +7,7 @@ import (
"strconv" "strconv"
"fmt" "fmt"
"slices" "slices"
"bytes"
) )
type CodeDataLog struct { type CodeDataLog struct {
@ -166,8 +167,11 @@ func (cdl *CodeDataLog) setCode(addr int) {
cdl.cache[addr] |= cdlCode cdl.cache[addr] |= cdlCode
} }
func (cdl *CodeDataLog) doCache() error { func (cdl *CodeDataLog) doCache(size int) error {
cdl.cache = make(map[int]cdlBit) cdl.cache = make(map[int]cdlBit)
for i := 0x6000; i < size+0x6000; i++ {
cdl.cache[i] = cdlUnknown
}
for _, rng := range cdl.Code { for _, rng := range cdl.Code {
start, err := strconv.ParseInt(rng.Start, 0, 32) start, err := strconv.ParseInt(rng.Start, 0, 32)
@ -215,15 +219,18 @@ func (cdl *CodeDataLog) doCache() error {
} }
func CdlFromJson(r io.Reader) (*CodeDataLog, error) { func CdlFromJson(r io.Reader) (*CodeDataLog, error) {
raw, err := io.ReadAll(r)
buf := bytes.NewReader(raw)
cdl := NewCDL() cdl := NewCDL()
dec := json.NewDecoder(r) dec := json.NewDecoder(buf)
err := dec.Decode(cdl) err = dec.Decode(cdl)
if err != nil { if err != nil {
return nil, err return nil, err
} }
//cdl.Data = []CdlRange{} //cdl.Data = []CdlRange{}
cdl.doCache() cdl.doCache(len(raw))
return cdl, nil return cdl, nil
} }

15
script/parser.go
View File

@ -191,26 +191,19 @@ INNER:
} }
// Add data tokens // Add data tokens
for addr, bit := range p.script.CDL.cache { for addr := 0x6002; addr < len(rawinput)+0x6000; addr++ {
if addr < 0x6002 { bit := p.script.CDL.cache[addr]
continue
}
// ignore code bytes // ignore code bytes
if bit & cdlCode == cdlCode { if bit & cdlCode == cdlCode {
continue continue
} }
// ignore labels outside the script's address range
if addr > len(rawinput)+0x6000 {
continue
}
if _, ok := p.script.Labels[addr]; ok { if _, ok := p.script.Labels[addr]; ok {
p.script.Tokens = append(p.script.Tokens, &Token{ p.script.Tokens = append(p.script.Tokens, &Token{
Offset: addr, Offset: addr,
Inline: []InlineVal{NewWordVal([]byte{rawinput[addr-0x6000], rawinput[addr+1-0x6000]})}, //Inline: []InlineVal{NewWordVal([]byte{rawinput[addr-0x6000], rawinput[addr+1-0x6000]})},
IsVariable: true, //IsVariable: true,
IsData: true, IsData: true,
cdl: bit.String(), cdl: bit.String(),
}) })

12
script/script.go
View File

@ -44,12 +44,12 @@ func (s *Script) DebugCDL(filename string) error {
return fmt.Errorf("origSize == 0") return fmt.Errorf("origSize == 0")
} }
if s.CDL.cache == nil { //if s.CDL.cache == nil {
err := s.CDL.doCache() // err := s.CDL.doCache()
if err != nil { // if err != nil {
return fmt.Errorf("doCache() error: %w", err) // return fmt.Errorf("doCache() error: %w", err)
} // }
} //}
dat := make([]byte, s.origSize) dat := make([]byte, s.origSize)
for i := 2; i < len(dat); i++ { for i := 2; i < len(dat); i++ {