X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=blobdiff_plain;f=base%2Ftables-examples.tct;h=5a1859dfdaa602975ffcac79853c547fc5ab8856;hp=f0f22354400958e7102e1ea56c99ec33c7a1d13b;hb=bfaa93970c4630c6e284ce183f58bc6d414f213b;hpb=79480f2c416419bcde9b9ac78f5f10bd4cc724e3

diff --git a/base/tables-examples.tct b/base/tables-examples.tct
index f0f2235..5a1859d 100644
--- a/base/tables-examples.tct
+++ b/base/tables-examples.tct
@@ -2,14 +2,15 @@ Type hb:			HBytes_Value @
 Init hb				hbytes_sentinel(&@);
 
 Type hbv:			HBytes_Var @
-Init hbv			@.hb=0; @.obj=0; @.var=0;
+Init hbv			@.hb=0; @.obj=0; @.var=0; @.copied=0;
 Fini hbv			fini_hbv(ip, rc, &@);
 
 Type sockaddr:			SockAddr_Value @
 Init sockaddr			sockaddr_clear(&@);
 
 Type sockid:			DgramSockID @
-Type ulong:			unsigned long @
+Type ulong:			uint32_t @
+Type long:			long @
 
 H-Include	"hbytes.h"
 
@@ -25,24 +26,36 @@ Table toplevel TopLevel_Command
 		...	obj
 
 Table ulong ULong_SubCommand
-	shift
-		right	charfrom("lr", "shift direction")
+	ul2int
 		v	ulong
-		bits	int
+		=>	int
+	int2ul
+		v	int
 		=>	ulong
 	mask
 		a	ulong
 		b	ulong
 		=>	ulong
+	add
+		a	ulong
+		b	ulong
+		=>	ulong
+	multiply
+		a	ulong
+		b	ulong
+		=>	ulong
+	subtract
+		a	ulong
+		b	ulong
+		=>	ulong
 	compare
 		a	ulong
 		b	ulong
 		=>	int
-	ul2int
+	shift
+		right	charfrom("lr", "shift direction")
 		v	ulong
-		=>	int
-	int2ul
-		v	int
+		bits	int
 		=>	ulong
 	ul2bitfields
 		value	ulong
@@ -60,18 +73,12 @@ Table hbytes HBytes_SubCommand
 	h2raw
 		hex	hb
 		=>	obj
-	ulong2h
-		value	ulong
-		=>	hb
-	h2ulong
-		hex	hb
-		=>	ulong
 	ushort2h
-		value	ulong
+		value	long
 		=>	hb
 	h2ushort
 		hex	hb
-		=>	ulong
+		=>	long
 	length
 		v	hb
 		=>	int
@@ -108,19 +115,30 @@ Table hbytes HBytes_SubCommand
  		v	hbv
  		length	int
  		=>	hb
+	overwrite
+		v	hbv
+		start	int
+		sub	hb
+	trimleft
+		v	hbv
+	zeroes
+		length	int
+		=>	hb
+	repeat
+		v	hb
+		count	int
+		=>	hb
+	random
+		length	int
+		=>	hb
  	pkcs5
  		meth	enum(PadMethod, "hbytes pad subcommand")
 		v	hbv
 		block	obj
 		=>	int
  	blockcipher
- 		encrypt	charfrom("de","encrypt/decrypt")
- 		v	hbv
- 		alg	enum(BlockCipherAlgInfo, "alg")
-		key	obj
- 		mode	enum(BlockCipherModeInfo, "mode")
- 		?iv	hb
- 		=>	hb
+ 		op	enum(BlockCipherOp, "op")
+		...	obj
  	hash
  		alg	enum(HashAlgInfo, "hash alg")
  		message	hb
@@ -131,12 +149,6 @@ Table hbytes HBytes_SubCommand
  		key	obj
  		?maclen	obj
  		=>	hb
-	zeroes
-		length	int
-		=>	hb
-	random
-		length	int
-		=>	hb
 
 Table dgram_socket DgramSocket_SubCommand
 	create
@@ -151,3 +163,29 @@ Table dgram_socket DgramSocket_SubCommand
 	on-receive
 		sock	sockid
 		?script	obj
+
+Table blockcipherop BlockCipherOp
+	e	1
+ 		v	hbv
+ 		alg	enum(BlockCipherAlgInfo, "alg")
+		key	obj
+ 		mode	enum(BlockCipherModeInfo, "mode")
+ 		?iv	hb
+ 		=>	hb
+	d	0
+ 		v	hbv
+ 		alg	enum(BlockCipherAlgInfo, "alg")
+		key	obj
+ 		mode	enum(BlockCipherModeInfo, "mode")
+ 		?iv	hb
+ 		=>	hb
+	mac	-1
+		msg	hb
+		alg	enum(BlockCipherAlgInfo, "alg")
+		key	obj
+ 		mode	enum(BlockCipherModeInfo, "mode")
+		iv	hb
+		=>	hb
+
+EntryExtra BlockCipherOp
+	int encrypt;