X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Finsts.lisp;h=5fc70d6547f0ec3ff0be34de8995cd04eb4f560a;hb=f7faed97898dd0e94a18b0d1fca03aaa0fe24ab0;hp=a7bc1b78486c8b0aadf54896d109adb90dd884b3;hpb=0af0ff077709778a17117b70563830d4baff0c84;p=sbcl.git diff --git a/src/compiler/x86-64/insts.lisp b/src/compiler/x86-64/insts.lisp index a7bc1b7..5fc70d6 100644 --- a/src/compiler/x86-64/insts.lisp +++ b/src/compiler/x86-64/insts.lisp @@ -827,6 +827,55 @@ ;; optional fields (imm)) +(sb!disassem:define-instruction-format (x66-ext-reg-reg/mem 32 + :default-printer + `(:name :tab reg ", " reg/mem)) + (x66 :field (byte 8 0) :type 'x66 :value #x66) + (prefix :field (byte 8 8) :value #b00001111) + (op :field (byte 7 17)) + (width :field (byte 1 16) :type 'width) + (reg/mem :fields (list (byte 2 30) (byte 3 24)) + :type 'reg/mem) + (reg :field (byte 3 27) :type 'reg) + ;; optional fields + (imm)) + +(sb!disassem:define-instruction-format (rex-ext-reg-reg/mem 32 + :default-printer + `(:name :tab reg ", " reg/mem)) + (rex :field (byte 4 4) :value #b0100) + (wrxb :field (byte 4 0) :type 'wrxb) + (prefix :field (byte 8 8) :value #b00001111) + (op :field (byte 7 17)) + (width :field (byte 1 16) :type 'width) + (reg/mem :fields (list (byte 2 30) (byte 3 24)) + :type 'reg/mem) + (reg :field (byte 3 27) :type 'reg) + ;; optional fields + (imm)) + +(sb!disassem:define-instruction-format (x66-rex-ext-reg-reg/mem 40 + :default-printer + `(:name :tab reg ", " reg/mem)) + (x66 :field (byte 8 0) :type 'x66 :value #x66) + (rex :field (byte 4 12) :value #b0100) + (wrxb :field (byte 4 8) :type 'wrxb) + (prefix :field (byte 8 16) :value #b00001111) + (op :field (byte 7 25)) + (width :field (byte 1 24) :type 'width) + (reg/mem :fields (list (byte 2 38) (byte 3 32)) + :type 'reg/mem) + (reg :field (byte 3 35) :type 'reg) + ;; optional fields + (imm)) + +(eval-when (:compile-toplevel :execute) + (defun ext-reg-reg/mem-printer-list (op &optional printer) + `((ext-reg-reg/mem ((op ,op)) ,@(when printer (list printer))) + (x66-ext-reg-reg/mem ((op ,op)) ,@(when printer (list printer))) + (rex-ext-reg-reg/mem ((op ,op)) ,@(when printer (list printer))) + (x66-rex-ext-reg-reg/mem ((op ,op)) ,@(when printer (list printer)))))) + (sb!disassem:define-instruction-format (ext-reg-reg/mem-no-width 24 :default-printer `(:name :tab reg ", " reg/mem)) @@ -906,7 +955,9 @@ (op :field (byte 8 8)) (reg/mem :fields (list (byte 2 22) (byte 3 16)) :type 'xmmreg/mem) - (reg :field (byte 3 19) :type 'xmmreg)) + (reg :field (byte 3 19) :type 'xmmreg) + ;; optional fields + (imm)) (sb!disassem:define-instruction-format (rex-xmm-xmm/mem 32 :default-printer @@ -917,7 +968,8 @@ (op :field (byte 8 16)) (reg/mem :fields (list (byte 2 30) (byte 3 24)) :type 'xmmreg/mem) - (reg :field (byte 3 27) :type 'xmmreg)) + (reg :field (byte 3 27) :type 'xmmreg) + (imm)) (sb!disassem:define-instruction-format (ext-xmm-xmm/mem 32 :default-printer @@ -927,7 +979,8 @@ (op :field (byte 8 16)) (reg/mem :fields (list (byte 2 30) (byte 3 24)) :type 'xmmreg/mem) - (reg :field (byte 3 27) :type 'xmmreg)) + (reg :field (byte 3 27) :type 'xmmreg) + (imm)) (sb!disassem:define-instruction-format (ext-rex-xmm-xmm/mem 40 :default-printer @@ -939,7 +992,8 @@ (op :field (byte 8 24)) (reg/mem :fields (list (byte 2 38) (byte 3 32)) :type 'xmmreg/mem) - (reg :field (byte 3 35) :type 'xmmreg)) + (reg :field (byte 3 35) :type 'xmmreg) + (imm)) ;;; Same as xmm-xmm/mem etc., but with direction bit. @@ -1090,58 +1144,6 @@ :type 'imm-byte :printer *sse-conditions*) -;;; XMM instructions with 8 bit immediate data - -(sb!disassem:define-instruction-format (xmm-xmm/mem-imm 24 - :default-printer - '(:name - :tab reg ", " reg/mem ", " imm)) - (x0f :field (byte 8 0) :value #x0f) - (op :field (byte 8 8)) - (reg/mem :fields (list (byte 2 22) (byte 3 16)) - :type 'xmmreg/mem) - (reg :field (byte 3 19) :type 'xmmreg) - (imm :type 'imm-byte)) - -(sb!disassem:define-instruction-format (rex-xmm-xmm/mem-imm 32 - :default-printer - '(:name - :tab reg ", " reg/mem ", " imm)) - (rex :field (byte 4 4) :value #b0100) - (wrxb :field (byte 4 0) :type 'wrxb) - (x0f :field (byte 8 8) :value #x0f) - (op :field (byte 8 16)) - (reg/mem :fields (list (byte 2 30) (byte 3 24)) - :type 'xmmreg/mem) - (reg :field (byte 3 27) :type 'xmmreg) - (imm :type 'imm-byte)) - -(sb!disassem:define-instruction-format (ext-xmm-xmm/mem-imm 32 - :default-printer - '(:name - :tab reg ", " reg/mem ", " imm)) - (prefix :field (byte 8 0)) - (x0f :field (byte 8 8) :value #x0f) - (op :field (byte 8 16)) - (reg/mem :fields (list (byte 2 30) (byte 3 24)) - :type 'xmmreg/mem) - (reg :field (byte 3 27) :type 'xmmreg) - (imm :type 'imm-byte)) - -(sb!disassem:define-instruction-format (ext-rex-xmm-xmm/mem-imm 40 - :default-printer - '(:name - :tab reg ", " reg/mem ", " imm)) - (prefix :field (byte 8 0)) - (rex :field (byte 4 12) :value #b0100) - (wrxb :field (byte 4 8) :type 'wrxb) - (x0f :field (byte 8 16) :value #x0f) - (op :field (byte 8 24)) - (reg/mem :fields (list (byte 2 38) (byte 3 32)) - :type 'xmmreg/mem) - (reg :field (byte 3 35) :type 'xmmreg) - (imm :type 'imm-byte)) - (sb!disassem:define-instruction-format (string-op 8 :include 'simple :default-printer '(:name width))) @@ -1998,7 +2000,8 @@ (define-instruction cmpxchg (segment dst src &optional prefix) ;; Register/Memory with Register. - (:printer ext-reg-reg/mem ((op #b1011000)) '(:name :tab reg/mem ", " reg)) + (:printer-list (ext-reg-reg/mem-printer-list #b1011000 + '(:name :tab reg/mem ", " reg))) (:emitter (aver (register-p src)) (emit-prefix segment prefix) @@ -2323,7 +2326,8 @@ (define-instruction xadd (segment dst src &optional prefix) ;; Register/Memory with Register. - (:printer ext-reg-reg/mem ((op #b1100000)) '(:name :tab reg/mem ", " reg)) + (:printer-list (ext-reg-reg/mem-printer-list #b1100000 + '(:name :tab reg/mem ", " reg))) (:emitter (aver (register-p src)) (emit-prefix segment prefix) @@ -2428,7 +2432,7 @@ (ext-reg-reg/mem-imm ((op ,(logior op #b100)) (imm nil :type signed-imm-byte))) (ext-reg-reg/mem ((op ,(logior op #b101))) - (:name :tab reg/mem ", " 'cl))))) + (:name :tab reg/mem ", " reg ", " 'cl))))) (define-instruction shld (segment dst src amt) (:declare (type (or (member :cl) (mod 32)) amt)) @@ -3223,8 +3227,10 @@ `(define-instruction ,name (segment dst src pattern) (:printer-list ',(sse-inst-printer-list - 'xmm-xmm/mem-imm prefix opcode - :more-fields `((imm nil :type ,shuffle-pattern)))) + 'xmm-xmm/mem prefix opcode + :more-fields `((imm nil :type ,shuffle-pattern)) + :printer '(:name :tab reg ", " reg/mem ", " imm))) + (:emitter (aver (typep pattern '(unsigned-byte ,n-bits))) (emit-regular-sse-inst segment dst src ,prefix ,opcode @@ -3250,7 +3256,7 @@ `(define-instruction ,name (segment op x y) (:printer-list ',(sse-inst-printer-list - 'xmm-xmm/mem-imm prefix opcode + 'xmm-xmm/mem prefix opcode :more-fields '((imm nil :type sse-condition-code)) :printer `(,name-prefix imm ,name-suffix :tab reg ", " reg/mem)))