diff options
| author | Andy Wingo <wingo@pobox.com> | 2013-07-21 17:11:18 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2013-07-21 17:12:23 +0200 |
| commit | 78ff784784a001c775b790dffe948b56c50bd153 (patch) | |
| tree | 6d715da60f2ed67553ce296c25e0ca3cbf808ab2 /module/system/vm/disassembler.scm | |
| parent | 746065c92e423290e34884d057bbabf14134f664 (diff) | |
| download | guile-78ff784784a001c775b790dffe948b56c50bd153.tar.gz | |
RTL instructions have no rest args
* libguile/instructions.c (FOR_EACH_INSTRUCTION_WORD_TYPE):
* module/system/vm/assembler.scm (assembler):
* module/system/vm/disassembler.scm (disassembler): Remove support for
RTL instructions with rest args.
Diffstat (limited to 'module/system/vm/disassembler.scm')
| -rw-r--r-- | module/system/vm/disassembler.scm | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/module/system/vm/disassembler.scm b/module/system/vm/disassembler.scm index 39b5d8cde..3b95f196b 100644 --- a/module/system/vm/disassembler.scm +++ b/module/system/vm/disassembler.scm @@ -78,8 +78,6 @@ #'((ash word -8))) ((U8_L24) #'((unpack-s24 (ash word -8)))) - ((U8_R24) - #'(#:rest (ash word -8))) ((U8_U8_I16) #'((logand (ash word -8) #xff) (ash word -16))) @@ -104,9 +102,6 @@ ((U8_L24) #'((logand word #xff) (unpack-s24 (ash word -8)))) - ((U8_R24) - #'((logand word #xff) - #:rest (ash word -8))) ((U8_U8_I16) #'((logand word #xff) (logand (ash word -8) #xff) @@ -141,8 +136,6 @@ ((X8_U12_U12) #'((logand (ash word -8) #xfff) (ash word -20))) - ((X8_R24) - #'(#:rest (ash word -8))) ((X8_L24) #'((unpack-s24 (ash word -8)))) ((B1_X7_L24) @@ -191,18 +184,7 @@ ;; -> len list (define (disassemble-one buf offset) (let ((first (u32-ref buf offset))) - (call-with-values - (lambda () - ((vector-ref disassemblers (logand first #xff)) buf offset first)) - (lambda (len list) - (match list - ((head ... #:rest rest) - (let lp ((n 0) (rhead (reverse head))) - (if (= n rest) - (values (+ len n) (reverse rhead)) - (lp (1+ n) - (cons (u32-ref buf (+ offset len n)) rhead))))) - (_ (values len list))))))) + ((vector-ref disassemblers (logand first #xff)) buf offset first))) (define (u32-offset->addr offset context) "Given an offset into an image in 32-bit units, return the absolute |