[prev in list] [next in list] [prev in thread] [next in thread] 

List:       sbcl-devel
Subject:    [Sbcl-devel] patch for Ironclad
From:       Douglas Katzman via Sbcl-devel <sbcl-devel () lists ! sourceforge ! net>
Date:       2018-08-03 9:43:57
Message-ID: CAOrNasy+hzt81jpXm9VxbAMu+FA2=P4wUW5wkO9m5hYHuPcfcA () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Hi, you'll need this. Can't compile at head SBCL without it.
I verified that it loads for x86, both 32- and 64-bit; I didn't run
anything with it.

[Attachment #5 (text/html)]

<div dir="ltr">Hi, you&#39;ll need this. Can&#39;t compile at head SBCL without \
it.<div>I verified that it loads for x86, both 32- and 64-bit; I didn&#39;t run \
anything with it.</div><div><br></div></div>

--000000000000ef0d1b057284c4ea--


["0001-Avoid-in-package-sb-vm.patch" (application/octet-stream)]

From 66aefd4ddf8f5397eba939848bee05118c837192 Mon Sep 17 00:00:00 2001
From: Douglas Katzman <dougk@google.com>
Date: Fri, 3 Aug 2018 05:31:30 -0400
Subject: [PATCH] Avoid (in-package :sb-vm)

Also don't try to interpret AES-NI-SUPPORT-P
---
 src/ciphers/aes.lisp        |  1 +
 src/sbcl-opt/x86oid-vm.lisp | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/ciphers/aes.lisp b/src/ciphers/aes.lisp
index f73f099..cd518e9 100644
--- a/src/ciphers/aes.lisp
+++ b/src/ciphers/aes.lisp
@@ -11,6 +11,7 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defun aes-ni-support-p ()
     (aes-ni-support-p))
+  (compile 'aes-ni-support-p)
   (when (aes-ni-support-p)
     (pushnew :aes-ni *features*)))
 
diff --git a/src/sbcl-opt/x86oid-vm.lisp b/src/sbcl-opt/x86oid-vm.lisp
index dd874a6..2d611c2 100644
--- a/src/sbcl-opt/x86oid-vm.lisp
+++ b/src/sbcl-opt/x86oid-vm.lisp
@@ -1,6 +1,24 @@
 ;;;; -*- mode: lisp; indent-tabs-mode: nil -*-
 #+sbcl
-(in-package :sb-vm)
+(defpackage "IRONCLAD-VM"
+  ;; more recent SBCL exports various symbols making this package
+  ;; definition more concise. This is the backward-compatible way.
+  (:use #:common-lisp
+        #:sb-c     ; for DEFINE-VOP and SC-IS
+        #:sb-assem ; for INST, GEN-LABEL
+        #:sb-vm)   ; for primtype names, SCs, constants
+  (:shadow #:ea) ; in case SB-VM exports it
+  (:import-from #:sb-vm
+                #+x86-64 #:reg-in-size ; soon to disappear, don't use
+                #:make-ea
+                #:positive-fixnum #:unsigned-num
+                #:descriptor-reg #:unsigned-reg #:double-reg #:immediate
+                #:simple-array-unsigned-byte-8
+                #:simple-array-unsigned-byte-32
+                #+x86-64 #:simple-array-unsigned-byte-64
+                #+x86-64 #:rax-offset #+x86-64 #:rcx-offset))
+
+#+sbcl (in-package "IRONCLAD-VM")
 
 #+(and sbcl (or x86 x86-64))
 (progn
-- 
2.18.0.597.ga71716f1ad-goog



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

_______________________________________________
Sbcl-devel mailing list
Sbcl-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sbcl-devel


[prev in list] [next in list] [prev in thread] [next in thread]