From d3a6fa85e5e6a0c59ea81ea8898654389a2dac73 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Lindqvist?= Date: Mon, 13 Jul 2015 00:54:12 +0200 Subject: [PATCH] tools.image-analyzer.data-heap-reader: payload should be unsigned bytes not chars --- .../data-heap-reader/data-heap-reader.factor | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/extra/tools/image-analyzer/data-heap-reader/data-heap-reader.factor b/extra/tools/image-analyzer/data-heap-reader/data-heap-reader.factor index bf8fa64440..bde3f80abd 100644 --- a/extra/tools/image-analyzer/data-heap-reader/data-heap-reader.factor +++ b/extra/tools/image-analyzer/data-heap-reader/data-heap-reader.factor @@ -2,7 +2,7 @@ USING: accessors assocs classes classes.struct io locals math.bitwise namespaces sequences system tools.image-analyzer.utils tools.image-analyzer.vm vm vocabs.parser ; IN: tools.image-analyzer.data-heap-reader -FROM: alien.c-types => char heap-size ; +FROM: alien.c-types => uchar heap-size ; FROM: arrays => 2array ; FROM: kernel => ? bi dup keep nip swap ; FROM: layouts => data-alignment ; @@ -64,8 +64,8 @@ GENERIC: read-payload ( rel-base struct -- tuple ) : read-array-payload ( array -- payload ) [ capacity>> -4 shift ] keep cell read-padded-payload ; -: read-char-payload ( n-bytes object -- payload ) - char read-padded-payload ; +: read-uchar-payload ( n-bytes object -- payload ) + uchar read-padded-payload ; : read-no-payload ( object -- payload ) 0 swap seek-past-padding { } ; @@ -80,13 +80,13 @@ M: no-payload read-payload ( rel-base object -- payload ) nip read-no-payload ; M: byte-array read-payload ( rel-base object -- payload ) - nip [ capacity>> -4 shift ] keep read-char-payload ; + nip [ capacity>> -4 shift ] keep read-uchar-payload ; M: callstack read-payload ( rel-base object -- payload ) - nip [ length>> -4 shift ] keep read-char-payload ; + nip [ length>> -4 shift ] keep read-uchar-payload ; M: string read-payload ( rel-base string -- payload ) - nip [ length>> -4 shift ] keep read-char-payload ; + nip [ length>> -4 shift ] keep read-uchar-payload ; M: tuple read-payload ( rel-base tuple -- payload ) [ -- 2.34.1