Skip to content

Fix for old versions of SBCL #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for old versions of SBCL #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions sbcl-opt/x86-64-vm.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
;;;; x86-64-vm.lisp -- VOP definitions SBCL

#+sbcl
(cl:in-package :sb-vm)
#+(and sbcl x86-64)
(defpackage :nibbles-vm
(:use :cl :sb-c :sb-assem :sb-vm)
(:shadow #:ea)
(:import-from :sb-vm
#:make-ea #:reg-in-size
#:generate-error-code #:invalid-array-index-error
#:positive-fixnum #:tagged-num
#:unsigned-num #:signed-num #:immediate
#:descriptor-reg #:any-reg #:unsigned-reg #:signed-reg
#:simple-array-unsigned-byte-8))

#+(and sbcl x86-64)
(in-package :nibbles-vm)

#+(and sbcl x86-64) (progn

Expand Down Expand Up @@ -66,7 +78,8 @@
(result-type (if signedp 'signed-num 'unsigned-num)))
(flet ((movx (insn dest source source-size)
(if (and (find-package "SB-X86-64-ASM")
(not (find-symbol "MOVZXD" "SB-X86-64-ASM")))
(not (find-symbol "MOVZXD" "SB-X86-64-ASM"))
(not (find-symbol "MOVZXD" "SB-VM")))
;; new assembler
(if (eq insn 'mov)
`(inst ,insn ,dest ,source)
Expand Down