-USING: accessors alien.c-types classes.struct combinators io kernel
-math math.bitwise tools.image-analyzer.gc-info tools.image-analyzer.vm ;
+USING: accessors alien.c-types classes.struct io kernel math
+math.bitwise tools.image-analyzer.gc-info tools.image-analyzer.vm ;
IN: tools.image-analyzer.code-heap-reader
QUALIFIED: layouts
-TUPLE: code-block-t free? owner parameters relocation gc-maps payload ;
-
: free? ( code-block -- ? )
header>> 1 mask? ;
: (read-code-block) ( -- code-block payload )
code-block [ read-struct ] [ heap-size ] bi over size swap - read ;
-: >code-block< ( code-block -- free? owner parameters relocation )
- { [ free? ] [ owner>> ] [ parameters>> ] [ relocation>> ] } cleave ;
-
: read-code-block ( -- code-block )
- (read-code-block)
- [ >code-block< ] [ [ byte-array>gc-maps ] keep ] bi*
- code-block-t boa ;
+ tell-input (read-code-block) 2dup [ free? ] [ byte-array>gc-maps ] bi*
+ code-heap-node boa ;
-USING: accessors assocs classes classes.struct io locals
-math.bitwise namespaces sequences system tools.image-analyzer.utils
-tools.image-analyzer.vm vm vocabs.parser ;
+USING: accessors assocs classes.struct io locals math.bitwise
+namespaces system tools.image-analyzer.utils tools.image-analyzer.vm
+vm vocabs.parser ;
IN: tools.image-analyzer.data-heap-reader
FROM: alien.c-types => uchar heap-size ;
FROM: arrays => 2array ;
-FROM: kernel => ? bi dup keep nip swap ;
+FROM: kernel => ? boa bi dup keep nip swap ;
FROM: layouts => data-alignment ;
FROM: math => + - * align neg shift ;
peek-read-object object-tag tag>class read-struct ;
: read-object ( rel-base -- object )
- (read-object) [ read-payload ] keep swap 2array ;
+ tell-input swap (read-object) [ read-payload ] keep swap heap-node boa ;
-USING: accessors arrays assocs classes.struct fry io io.encodings.binary
-io.files io.streams.byte-array kernel kernel.private math sequences
-tools.image-analyzer.code-heap-reader tools.image-analyzer.data-heap-reader
-tools.image-analyzer.utils tools.image-analyzer.vm vm ;
+USING: accessors classes.struct fry io io.encodings.binary io.files
+io.streams.byte-array kernel sequences
+tools.image-analyzer.code-heap-reader
+tools.image-analyzer.data-heap-reader tools.image-analyzer.utils
+tools.image-analyzer.vm ;
IN: tools.image-analyzer
: code-heap>code-blocks ( code-heap -- code-blocks )
binary [ [ read-code-block ] consume-stream>sequence ] with-byte-reader ;
-: data-heap>objects ( data-relocation-base data-heap -- object-assoc )
+: data-heap>objects ( data-relocation-base data-heap -- seq )
binary [ '[ _ read-object ] consume-stream>sequence ] with-byte-reader ;
: load-image ( image -- header data-heap code-heap )
{ owner cell_t }
{ parameters cell_t }
{ relocation cell_t } ;
+
+TUPLE: heap-node address object payload ;
+
+TUPLE: code-heap-node < heap-node free? gc-maps ;