svn commit: r416683 - in head/emulators: . qemu-cheri qemu-cheri128 qemu-cheri128m

[Brooks Davis]

Author: brooks
Date: Fri Jun 10 14:41:14 2016
New Revision: 416683
URL: https://svnweb.freebsd.org/changeset/ports/416683

Log:
  Update qemu-cheri* to a fresh snapshot.
  
  Switch qemu-cheri128 to compressed 128-bit capabilities per the soon to be
  released ISA v5.  Introduce a new qemu-cheri128m port which retains
  support for 128-bit capabilities that magically store 256-bit of data
  preserving semantic compatiblity with 256-bit capabilities while having
  128-bit size and alignment requirments.

Added:
  head/emulators/qemu-cheri128m/
     - copied from r416682, head/emulators/qemu-cheri128/
Modified:
  head/emulators/Makefile
  head/emulators/qemu-cheri/Makefile.snapshot
  head/emulators/qemu-cheri/distinfo
  head/emulators/qemu-cheri128/Makefile
  head/emulators/qemu-cheri128m/Makefile

Modified: head/emulators/Makefile
==============================================================================
--- head/emulators/Makefile	Fri Jun 10 14:19:55 2016	(r416682)
+++ head/emulators/Makefile	Fri Jun 10 14:41:14 2016	(r416683)
@@ -118,6 +118,7 @@
     SUBDIR += qemu
     SUBDIR += qemu-cheri
     SUBDIR += qemu-cheri128
+    SUBDIR += qemu-cheri128m
     SUBDIR += qemu-devel
     SUBDIR += qemu-launcher
     SUBDIR += qemu-sbruno

Modified: head/emulators/qemu-cheri/Makefile.snapshot
==============================================================================
--- head/emulators/qemu-cheri/Makefile.snapshot	Fri Jun 10 14:19:55 2016	(r416682)
+++ head/emulators/qemu-cheri/Makefile.snapshot	Fri Jun 10 14:41:14 2016	(r416683)
@@ -4,6 +4,6 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-SNAPDATE=	20160514
+SNAPDATE=	20160610
 
-QEMU_COMMIT=		afe5bbc23efd4093c1c35cd7d58e4cf8c1569143
+QEMU_COMMIT=		09b76d7d846b439c2af66947ed688f23e42ccc0a

Modified: head/emulators/qemu-cheri/distinfo
==============================================================================
--- head/emulators/qemu-cheri/distinfo	Fri Jun 10 14:19:55 2016	(r416682)
+++ head/emulators/qemu-cheri/distinfo	Fri Jun 10 14:41:14 2016	(r416683)
@@ -1,2 +1,2 @@
-SHA256 (CTSRD-CHERI-qemu-0.d20160514-afe5bbc23efd4093c1c35cd7d58e4cf8c1569143_GH0.tar.gz) = e15cbce6e52f6f4d6b4032c77e282ec65fdd92a0de61d1c80f78fd5aa22e7203
-SIZE (CTSRD-CHERI-qemu-0.d20160514-afe5bbc23efd4093c1c35cd7d58e4cf8c1569143_GH0.tar.gz) = 11141289
+SHA256 (CTSRD-CHERI-qemu-0.d20160610-09b76d7d846b439c2af66947ed688f23e42ccc0a_GH0.tar.gz) = 48d5fbe96de648bbc5fadf8dd996b8f24f04d7767b8e1138598704ffa9759f70
+SIZE (CTSRD-CHERI-qemu-0.d20160610-09b76d7d846b439c2af66947ed688f23e42ccc0a_GH0.tar.gz) = 11147193

Modified: head/emulators/qemu-cheri128/Makefile
==============================================================================
--- head/emulators/qemu-cheri128/Makefile	Fri Jun 10 14:19:55 2016	(r416682)
+++ head/emulators/qemu-cheri128/Makefile	Fri Jun 10 14:41:14 2016	(r416683)
@@ -9,7 +9,7 @@ RUN_DEPENDS=	qemu-system-cheri:emulators
 
 MASTERDIR=	${.CURDIR}/../qemu-cheri
 
-EXTRA_CFLAGS=	-DCHERI_MAGIC128
+EXTRA_CFLAGS=	-DCHERI_128
 PLIST=		/dev/null
 PLIST_FILES=	bin/qemu-system-cheri128
 

Modified: head/emulators/qemu-cheri128m/Makefile
==============================================================================
--- head/emulators/qemu-cheri128/Makefile	Fri Jun 10 14:19:55 2016	(r416682)
+++ head/emulators/qemu-cheri128m/Makefile	Fri Jun 10 14:41:14 2016	(r416683)
@@ -1,9 +1,9 @@
 # Created by: Brooks Davis
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-cheri128
+PKGNAMESUFFIX=	-cheri128m
 
-COMMENT=	QEMU emulator with CHERI CPU support (128-bit)
+COMMENT=	QEMU emulator with CHERI CPU support (128-bit, magic compression)
 
 RUN_DEPENDS=	qemu-system-cheri:emulators/qemu-cheri
 
@@ -11,10 +11,10 @@ MASTERDIR=	${.CURDIR}/../qemu-cheri
 
 EXTRA_CFLAGS=	-DCHERI_MAGIC128
 PLIST=		/dev/null
-PLIST_FILES=	bin/qemu-system-cheri128
+PLIST_FILES=	bin/qemu-system-cheri128m
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cheri-softmmu/qemu-system-cheri \
-	    ${STAGEDIR}${PREFIX}/bin/qemu-system-cheri128
+	    ${STAGEDIR}${PREFIX}/bin/qemu-system-cheri128m
 
 .include <${MASTERDIR}/Makefile>