mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-19 18:20:22 +02:00
Code Activity

Add sign-extending make-immediate instruction

Browse source 
* doc/ref/vm.texi (Instruction Set, Constant Instructions): Document new
  instruction.
* libguile/instructions.c (FOR_EACH_INSTRUCTION_WORD_TYPE): New first
  word kind with zi16 operand.
* libguile/jit.c (compile_make_immediate, compile_make_immediate_slow):
  New compilers.
  (COMPILE_X8_S8_ZI16): New operand kind.
* libguile/vm-engine.c (make-immediate): New instruction.
* module/language/bytecode.scm:
* module/system/vm/assembler.scm (encode-X8_S8_ZI16<-/shuffle):
  (signed-bits, load-constant): Support the new instruction kind.
* module/system/vm/disassembler.scm (disassemblers)
  (sign-extended-immediate, code-annotation): Support for zi16
  operands.
This commit is contained in:
Andy Wingo 2020-07-30 17:36:11 +02:00
parent f13b27a4cc
commit 172e5ccfc1
7 changed files with 88 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

32
module/system/vm/assembler.scm
View file

@ -682,6 +682,10 @@ later by the linker."
(emit asm opcode))
((X8_S8_I16 a imm)
(emit asm (pack-u8-u8-u16 opcode a (immediate-bits asm imm))))
((X8_S8_ZI16 a imm)
(emit asm (pack-u8-u8-u16 opcode a
(signed-bits asm (immediate-bits asm imm)
16))))
((X8_S12_S12 a b)
(emit asm (pack-u8-u12-u12 opcode a b)))
((X8_S12_C12 a b)
@ -906,6 +910,15 @@ later by the linker."
(emit-push asm dst)
(encode-X8_S8_I16 asm 0 imm opcode)
(emit-pop asm dst))))
(define (encode-X8_S8_ZI16<-/shuffle asm dst imm opcode)
(cond
((< dst (ash 1 8))
(encode-X8_S8_ZI16 asm dst imm opcode))
(else
;; Push garbage value to make space for dst.
(emit-push asm dst)
(encode-X8_S8_ZI16 asm 0 imm opcode)
(emit-pop asm dst))))
(define (encode-X8_S8_S8_S8!/shuffle asm a b c opcode)
(cond
((< (logior a b c) (ash 1 8))
@ -1030,6 +1043,7 @@ later by the linker."
(('<- 'X8_S12_C12) #'encode-X8_S12_C12<-/shuffle)
(('! 'X8_S12_Z12) #'encode-X8_S12_Z12!/shuffle)
(('<- 'X8_S8_I16) #'encode-X8_S8_I16<-/shuffle)
(('<- 'X8_S8_ZI16) #'encode-X8_S8_ZI16<-/shuffle)
(('! 'X8_S8_S8_S8) #'encode-X8_S8_S8_S8!/shuffle)
(('<- 'X8_S8_S8_S8) #'encode-X8_S8_S8_S8<-/shuffle)
(('<- 'X8_S8_S8_C8) #'encode-X8_S8_S8_C8<-/shuffle)
@ -1076,6 +1090,7 @@ later by the linker."
('X8_C24 #'(arg))
('X8_L24 #'(label))
('X8_S8_I16 #'(a imm))
('X8_S8_ZI16 #'(a imm))
('X8_S12_S12 #'(a b))
('X8_S12_C12 #'(a b))
('X8_S12_Z12 #'(a b))
@ -1209,6 +1224,21 @@ immediate, and @code{#f} otherwise."
(and (not (zero? (logand bits 6)))
bits))))
(define (signed-bits asm uimm n)
"Given the immediate-bits encoding @var{uimm}, return its bit pattern
if it can be restricted to a sign-extended bitfield of @var{n} bits, or
@code{#f} otherwise."
(let* ((all-bits (1- (ash 1 (* (asm-word-size asm) 8))))
(fixed-bits (1- (ash 1 n)))
(sign-bits (lognot (ash fixed-bits -1))))
(cond
((eqv? (logand all-bits sign-bits) (logand uimm sign-bits))
(logand uimm fixed-bits))
((zero? (logand uimm sign-bits))
uimm)
(else
#f))))
(define-record-type <stringbuf>
(make-stringbuf string)
stringbuf?
@ -1368,6 +1398,8 @@ returned instead."
((immediate-bits asm obj)
=> (lambda (bits)
(cond
((and (< dst 256) (signed-bits asm bits 16))
(emit-make-immediate asm dst obj))
((and (< dst 256) (zero? (ash bits -16)))
(emit-make-short-immediate asm dst obj))
((zero? (ash bits -32))