Regenerate Linux/amd64 using latest CCGO.

	modified:   generator.go
	modified:   internal/bin/bin_linux_amd64.go
	modified:   internal/mptest/mptest_linux_amd64.go
	modified:   internal/threadtest1/threadtest1_linux_amd64.go
	modified:   internal/threadtest2/threadtest2_linux_amd64.go
	modified:   internal/threadtest3/threadtest3_linux_amd64.go
	modified:   internal/threadtest4/threadtest4_linux_amd64.go

1 files changed, 143 insertions, 110 deletions

diff --git a/internal/threadtest4/threadtest4_linux_amd64.go b/internal/threadtest4/threadtest4_linux_amd64.go
index 1819620..dac314b 100644
--- a/internal/threadtest4/threadtest4_linux_amd64.go
+++ b/internal/threadtest4/threadtest4_linux_amd64.go
@@ -1,36 +1,36 @@
 // Code generated by ccgo. DO NOT EDIT.
 
-// threadtest4.c
-
-// 2014-12-11
-//
-// The author disclaims copyright to this source code.  In place of
-// a legal notice, here is a blessing:
-//
-// May you do good and not evil.
-// May you find forgiveness for yourself and forgive others.
-// May you share freely, never taking more than you give.
-//
-// *************************************************************************
-// This file implements a simple standalone program used to stress the
-// SQLite library when accessing the same set of databases simultaneously
-// from multiple threads in shared-cache mode.
-//
-// This test program runs on unix-like systems only.  It uses pthreads.
-// To compile:
-//
-// gcc -g -Wall -I. threadtest4.c sqlite3.c -ldl -lpthread
-//
-// To run:
-//
-// ./a.out 10
-//
-// The argument is the number of threads.  There are also options, such
-// as -wal and -multithread and -serialized.
-//
-// Consider also compiling with clang instead of gcc and adding the
-// -fsanitize=thread option.
-
+// threadtest4
+//  /*
+//  ** 2014-12-11
+//  **
+//  ** The author disclaims copyright to this source code.  In place of
+//  ** a legal notice, here is a blessing:
+//  **
+//  **    May you do good and not evil.
+//  **    May you find forgiveness for yourself and forgive others.
+//  **    May you share freely, never taking more than you give.
+//  **
+//  *************************************************************************
+//  ** This file implements a simple standalone program used to stress the
+//  ** SQLite library when accessing the same set of databases simultaneously
+//  ** from multiple threads in shared-cache mode.
+//  **
+//  ** This test program runs on unix-like systems only.  It uses pthreads.
+//  ** To compile:
+//  **
+//  **     gcc -g -Wall -I. threadtest4.c sqlite3.c -ldl -lpthread
+//  **
+//  ** To run:
+//  **
+//  **     ./a.out 10
+//  **
+//  ** The argument is the number of threads.  There are also options, such
+//  ** as -wal and -multithread and -serialized.
+//  **
+//  ** Consider also compiling with clang instead of gcc and adding the
+//  ** -fsanitize=thread option.
+//  */
 package main
 
 import (
@@ -68,13 +68,13 @@ var X__stdfiles [3]unsafe.Pointer
 var Xstdout unsafe.Pointer
 
 func init() {
-	Xstdout = (unsafe.Pointer)(uintptr(unsafe.Pointer(&X__stdfiles)) + 8)
+	Xstdout = unsafe.Pointer(uintptr(unsafe.Pointer(&X__stdfiles)) + 8)
 }
 
 var Xstderr unsafe.Pointer
 
 func init() {
-	Xstderr = (unsafe.Pointer)(uintptr(unsafe.Pointer(&X__stdfiles)) + 16)
+	Xstderr = unsafe.Pointer(uintptr(unsafe.Pointer(&X__stdfiles)) + 16)
 }
 
 func Xmain(tls *crt.TLS, _argc int32, _argv **int8) (r0 int32) {
@@ -97,11 +97,11 @@ _0:
 	if _i >= _argc {
 		goto _3
 	}
-	_1_z = *(**int8)(unsafe.Pointer(uintptr((unsafe.Pointer)(_argv)) + 8*uintptr(_i)))
-	if int32(*(*int8)(unsafe.Pointer(uintptr((unsafe.Pointer)(_1_z)) + 1*uintptr(i32(0))))) != i32(45) {
+	_1_z = *(**int8)(unsafe.Pointer(uintptr(unsafe.Pointer(_argv)) + 8*uintptr(_i)))
+	if int32(*(*int8)(unsafe.Pointer(uintptr(unsafe.Pointer(_1_z)) + 1*uintptr(i32(0))))) != i32(45) {
 		goto _4
 	}
-	if (int32(*(*int8)(unsafe.Pointer(uintptr((unsafe.Pointer)(_1_z)) + 1*uintptr(i32(1))))) == i32(45)) && (int32(*(*int8)(unsafe.Pointer(uintptr((unsafe.Pointer)(_1_z)) + 1*uintptr(i32(2))))) != i32(0)) {
+	if (int32(*(*int8)(unsafe.Pointer(uintptr(unsafe.Pointer(_1_z)) + 1*uintptr(i32(1))))) == i32(45)) && (int32(*(*int8)(unsafe.Pointer(uintptr(unsafe.Pointer(_1_z)) + 1*uintptr(i32(2))))) != i32(0)) {
 		*(*uintptr)(unsafe.Pointer(&_1_z)) += uintptr(1)
 	}
 	if crt.Xstrcmp(tls, _1_z, str(0)) == i32(0) {
@@ -138,12 +138,12 @@ _0:
 		}
 		goto _14
 	}
-	crt.Xfprintf(tls, (*crt.XFILE)(Xstderr), str(37), unsafe.Pointer(*(**int8)(unsafe.Pointer(uintptr((unsafe.Pointer)(_argv)) + 8*uintptr(_i)))))
+	crt.Xfprintf(tls, (*crt.XFILE)(Xstderr), str(37), unsafe.Pointer(*(**int8)(unsafe.Pointer(uintptr(unsafe.Pointer(_argv)) + 8*uintptr(_i)))))
 	crt.Xexit(tls, i32(1))
 _14:
 	goto _20
 _4:
-	if int32(*(*int8)(unsafe.Pointer(uintptr((unsafe.Pointer)(_1_z)) + 1*uintptr(i32(0))))) < i32(49) || int32(*(*int8)(unsafe.Pointer(uintptr((unsafe.Pointer)(_1_z)) + 1*uintptr(i32(0))))) > i32(57) || _nWorker != i32(0) {
+	if int32(*(*int8)(unsafe.Pointer(uintptr(unsafe.Pointer(_1_z)) + 1*uintptr(i32(0))))) < i32(49) || int32(*(*int8)(unsafe.Pointer(uintptr(unsafe.Pointer(_1_z)) + 1*uintptr(i32(0))))) > i32(57) || _nWorker != i32(0) {
 		goto _18
 	}
 	_nWorker = crt.Xatoi(tls, _1_z)
@@ -153,14 +153,14 @@ _4:
 	}
 	goto _20
 _18:
-	crt.Xfprintf(tls, (*crt.XFILE)(Xstderr), str(92), unsafe.Pointer(*(**int8)(unsafe.Pointer(uintptr((unsafe.Pointer)(_argv)) + 8*uintptr(_i)))))
+	crt.Xfprintf(tls, (*crt.XFILE)(Xstderr), str(92), unsafe.Pointer(*(**int8)(unsafe.Pointer(uintptr(unsafe.Pointer(_argv)) + 8*uintptr(_i)))))
 	crt.Xexit(tls, i32(1))
 _20:
 	_i += 1
 	goto _0
 _3:
 	if _nWorker == i32(0) {
-		crt.Xfprintf(tls, (*crt.XFILE)(Xstderr), str(127), unsafe.Pointer(*(**int8)(unsafe.Pointer(uintptr((unsafe.Pointer)(_argv)) + 8*uintptr(i32(0))))))
+		crt.Xfprintf(tls, (*crt.XFILE)(Xstderr), str(127), unsafe.Pointer(*(**int8)(unsafe.Pointer(uintptr(unsafe.Pointer(_argv)) + 8*uintptr(i32(0))))))
 		crt.Xexit(tls, i32(1))
 	}
 	if bin.Xsqlite3_threadsafe(tls) == 0 {
@@ -178,9 +178,9 @@ _3:
 		crt.Xfprintf(tls, (*crt.XFILE)(Xstderr), str(338))
 		crt.Xexit(tls, i32(1))
 	}
-	crt.Xmemset(tls, (unsafe.Pointer)(&_infoTop), i32(0), u64(64))
-	*(*unsafe.Pointer)(unsafe.Pointer(&(_infoTop.X4))) = _db
-	*(*uint32)(unsafe.Pointer(&(_infoTop.X2))) = _wkrFlags
+	crt.Xmemset(tls, unsafe.Pointer(&_infoTop), i32(0), u64(64))
+	*(*unsafe.Pointer)(unsafe.Pointer(&_infoTop.X4)) = _db
+	*(*uint32)(unsafe.Pointer(&_infoTop.X2)) = _wkrFlags
 	_p = &_infoTop
 	if (_wkrFlags & uint32(i32(2))) != 0 {
 		_run_sql(tls, _p, str(382))
@@ -198,18 +198,18 @@ _3:
 	_run_sql(tls, _p, str(805))
 	_run_sql(tls, _p, str(841))
 	_aInfo = (*XWorkerInfo)(_safe_malloc(tls, int32(u64(64)*uint64(_nWorker))))
-	crt.Xmemset(tls, (unsafe.Pointer)(_aInfo), i32(0), u64(64)*uint64(_nWorker))
+	crt.Xmemset(tls, unsafe.Pointer(_aInfo), i32(0), u64(64)*uint64(_nWorker))
 	_i = i32(0)
 _25:
 	if _i >= _nWorker {
 		goto _28
 	}
-	*(*int32)(unsafe.Pointer(&((*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo)) + 64*uintptr(_i))).X0))) = _i + i32(1)
-	*(*int32)(unsafe.Pointer(&((*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo)) + 64*uintptr(_i))).X1))) = _nWorker
-	*(*uint32)(unsafe.Pointer(&((*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo)) + 64*uintptr(_i))).X2))) = _wkrFlags
-	*(*unsafe.Pointer)(unsafe.Pointer(&((*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo)) + 64*uintptr(_i))).X3))) = _db
-	*(**crt.Xpthread_mutex_t)(unsafe.Pointer((*unsafe.Pointer)(unsafe.Pointer(&((*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo)) + 64*uintptr(_i))).X9))))) = &_wrMutex
-	_rc = crt.Xpthread_create(tls, (*uint64)(unsafe.Pointer(&((*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo)) + 64*uintptr(_i))).X8))), nil, _worker_thread, (unsafe.Pointer)((*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo))+64*uintptr(_i)))))
+	*(*int32)(unsafe.Pointer(&((*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo)) + 64*uintptr(_i))).X0))) = _i + i32(1)
+	*(*int32)(unsafe.Pointer(&((*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo)) + 64*uintptr(_i))).X1))) = _nWorker
+	*(*uint32)(unsafe.Pointer(&((*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo)) + 64*uintptr(_i))).X2))) = _wkrFlags
+	*(*unsafe.Pointer)(unsafe.Pointer(&((*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo)) + 64*uintptr(_i))).X3))) = _db
+	*(**crt.Xpthread_mutex_t)(unsafe.Pointer((*unsafe.Pointer)(unsafe.Pointer(&((*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo)) + 64*uintptr(_i))).X9))))) = &_wrMutex
+	_rc = crt.Xpthread_create(tls, (*uint64)(unsafe.Pointer(&((*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo)) + 64*uintptr(_i))).X8))), nil, _worker_thread, unsafe.Pointer((*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo))+64*uintptr(_i)))))
 	if _rc != i32(0) {
 		crt.Xfprintf(tls, (*crt.XFILE)(Xstderr), str(876), _i+i32(1))
 		crt.Xexit(tls, i32(1))
@@ -223,22 +223,22 @@ _30:
 	if _i >= _nWorker {
 		goto _33
 	}
-	crt.Xpthread_join(tls, (*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo))+64*uintptr(_i))).X8, nil)
-	crt.Xprintf(tls, str(914), (*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo))+64*uintptr(_i))).X0, (*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo))+64*uintptr(_i))).X5, (*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo))+64*uintptr(_i))).X6)
-	if ((*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo)) + 64*uintptr(_i))).X7) != nil {
-		crt.Xprintf(tls, str(954), unsafe.Pointer((*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo))+64*uintptr(_i))).X7))
+	crt.Xpthread_join(tls, (*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo))+64*uintptr(_i))).X8, nil)
+	crt.Xprintf(tls, str(914), (*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo))+64*uintptr(_i))).X0, (*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo))+64*uintptr(_i))).X5, (*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo))+64*uintptr(_i))).X6)
+	if ((*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo)) + 64*uintptr(_i))).X7) != nil {
+		crt.Xprintf(tls, str(954), unsafe.Pointer((*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo))+64*uintptr(_i))).X7))
 		goto _35
 	}
 	crt.Xprintf(tls, str(960))
 _35:
 	{
 		p := &_nErr
-		*p = (*p) + ((*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo)) + 64*uintptr(_i))).X5)
+		*p = (*p) + ((*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo)) + 64*uintptr(_i))).X5)
 		sink1(*p)
 	}
 	{
 		p := &_nTest
-		*p = (*p) + ((*XWorkerInfo)(unsafe.Pointer(uintptr((unsafe.Pointer)(_aInfo)) + 64*uintptr(_i))).X6)
+		*p = (*p) + ((*XWorkerInfo)(unsafe.Pointer(uintptr(unsafe.Pointer(_aInfo)) + 64*uintptr(_i))).X6)
 		sink1(*p)
 	}
 	crt.Xfflush(tls, (*crt.XFILE)(Xstdout))
@@ -246,7 +246,7 @@ _35:
 	goto _30
 _33:
 	bin.Xsqlite3_close(tls, (*bin.Xsqlite3)(_db))
-	bin.Xsqlite3_free(tls, (unsafe.Pointer)(_aInfo))
+	bin.Xsqlite3_free(tls, unsafe.Pointer(_aInfo))
 	crt.Xprintf(tls, str(962), _nErr, _nTest)
 	return _nErr
 
@@ -255,7 +255,10 @@ _33:
 	panic(0)
 }
 
-// Run a SQL statements.  Panic if unable.
+// C comment
+//  /*
+//  ** Run a SQL statements.  Panic if unable.
+//  */
 func _run_sql(tls *crt.TLS, _p *XWorkerInfo, _zFormat *int8, args ...interface{}) {
 	var _rc, _i, _nRetry int32
 	var _zSql *int8
@@ -266,7 +269,7 @@ func _run_sql(tls *crt.TLS, _p *XWorkerInfo, _zFormat *int8, args ...interface{}
 	_ap = args
 	_zSql = bin.Xsqlite3_vmprintf(tls, _zFormat, _ap)
 	_ap = nil
-	_check_oom(tls, (unsafe.Pointer)(_zSql))
+	_check_oom(tls, unsafe.Pointer(_zSql))
 	_i = i32(0)
 _0:
 	if _i >= i32(1000) {
@@ -307,11 +310,14 @@ _9:
 	}
 	goto _6
 _7:
-	bin.Xsqlite3_free(tls, (unsafe.Pointer)(_zSql))
+	bin.Xsqlite3_free(tls, unsafe.Pointer(_zSql))
 	bin.Xsqlite3_finalize(tls, _pStmt)
 }
 
-// Report an OOM error and die if the argument is NULL
+// C comment
+//  /*
+//  ** Report an OOM error and die if the argument is NULL
+//  */
 func _check_oom(tls *crt.TLS, _x unsafe.Pointer) {
 	if _x == nil {
 		crt.Xfprintf(tls, (*crt.XFILE)(Xstderr), str(1151))
@@ -319,23 +325,29 @@ func _check_oom(tls *crt.TLS, _x unsafe.Pointer) {
 	}
 }
 
-// Print a trace message for a worker
+// C comment
+//  /*
+//  ** Print a trace message for a worker
+//  */
 func _worker_trace(tls *crt.TLS, _p *XWorkerInfo, _zFormat *int8, args ...interface{}) {
 	var _zMsg *int8
 	var _ap []interface{}
-	if ((_p.X2) & uint32(i32(4))) == uint32(i32(0)) {
+	if (_p.X2 & uint32(i32(4))) == uint32(i32(0)) {
 		return
 	}
 	_ap = args
 	_zMsg = bin.Xsqlite3_vmprintf(tls, _zFormat, _ap)
-	_check_oom(tls, (unsafe.Pointer)(_zMsg))
+	_check_oom(tls, unsafe.Pointer(_zMsg))
 	_ap = nil
 	crt.Xfprintf(tls, (*crt.XFILE)(Xstderr), str(1166), _p.X0, unsafe.Pointer(_zMsg))
-	bin.Xsqlite3_free(tls, (unsafe.Pointer)(_zMsg))
+	bin.Xsqlite3_free(tls, unsafe.Pointer(_zMsg))
 }
 
-// Allocate memory.  If the allocation fails, print an error message and
-// kill the process.
+// C comment
+//  /*
+//  ** Allocate memory.  If the allocation fails, print an error message and
+//  ** kill the process.
+//  */
 func _safe_malloc(tls *crt.TLS, _sz int32) (r0 unsafe.Pointer) {
 	var _x unsafe.Pointer
 	_x = bin.Xsqlite3_malloc(tls, func() int32 {
@@ -348,7 +360,10 @@ func _safe_malloc(tls *crt.TLS, _sz int32) (r0 unsafe.Pointer) {
 	return _x
 }
 
-// Each thread runs the following function.
+// C comment
+//  /*
+//  ** Each thread runs the following function.
+//  */
 func _worker_thread(tls *crt.TLS, _pArg unsafe.Pointer) (r0 unsafe.Pointer) {
 	var _iOuter, _i, _rc int32
 	var _pStmt unsafe.Pointer
@@ -358,7 +373,7 @@ func _worker_thread(tls *crt.TLS, _pArg unsafe.Pointer) (r0 unsafe.Pointer) {
 	crt.Xfflush(tls, (*crt.XFILE)(Xstdout))
 	_iOuter = i32(1)
 _0:
-	if _iOuter > (_p.X1) {
+	if _iOuter > _p.X1 {
 		goto _3
 	}
 	_worker_open_connection(tls, _p, _iOuter)
@@ -367,9 +382,9 @@ _4:
 	if _i >= i32(4) {
 		goto _7
 	}
-	_worker_add_content(tls, _p, (_i*i32(100))+i32(1), (_i+i32(1))*i32(100), (((_p.X0)+_iOuter)%i32(3))+i32(1))
-	_worker_add_content(tls, _p, (_i*i32(100))+i32(1), (_i+i32(1))*i32(100), ((((_p.X0)+_iOuter)+i32(1))%i32(3))+i32(1))
-	_worker_add_content(tls, _p, (_i*i32(100))+i32(1), (_i+i32(1))*i32(100), ((((_p.X0)+_iOuter)+i32(2))%i32(3))+i32(1))
+	_worker_add_content(tls, _p, (_i*i32(100))+i32(1), (_i+i32(1))*i32(100), ((_p.X0+_iOuter)%i32(3))+i32(1))
+	_worker_add_content(tls, _p, (_i*i32(100))+i32(1), (_i+i32(1))*i32(100), (((_p.X0+_iOuter)+i32(1))%i32(3))+i32(1))
+	_worker_add_content(tls, _p, (_i*i32(100))+i32(1), (_i+i32(1))*i32(100), (((_p.X0+_iOuter)+i32(2))%i32(3))+i32(1))
 	_i += 1
 	goto _4
 _7:
@@ -385,12 +400,12 @@ _7:
 	}
 _10:
 	bin.Xsqlite3_finalize(tls, _pStmt)
-	if (_p.X5) != 0 {
+	if _p.X5 != 0 {
 		goto _3
 	}
-	if ((_iOuter + (_p.X0)) % i32(3)) == i32(0) {
+	if ((_iOuter + _p.X0) % i32(3)) == i32(0) {
 		bin.Xsqlite3_db_release_memory(tls, (*bin.Xsqlite3)(_p.X4))
-		*(*int32)(unsafe.Pointer(&(_p.X6))) += 1
+		*(*int32)(unsafe.Pointer(&_p.X6)) += 1
 	}
 	crt.Xpthread_mutex_lock(tls, (*crt.Xpthread_mutex_t)(_p.X9))
 	_run_sql(tls, _p, str(1286))
@@ -398,9 +413,9 @@ _10:
 	_run_sql(tls, _p, str(1325))
 	_run_sql(tls, _p, str(1357))
 	_run_sql(tls, _p, str(1389))
-	*(*int32)(unsafe.Pointer(&(_p.X6))) += 1
+	*(*int32)(unsafe.Pointer(&_p.X6)) += 1
 	crt.Xpthread_mutex_unlock(tls, (*crt.Xpthread_mutex_t)(_p.X9))
-	if _iOuter == (_p.X0) {
+	if _iOuter == _p.X0 {
 		crt.Xpthread_mutex_lock(tls, (*crt.Xpthread_mutex_t)(_p.X9))
 		_run_sql(tls, _p, str(1399))
 		crt.Xpthread_mutex_unlock(tls, (*crt.Xpthread_mutex_t)(_p.X9))
@@ -409,7 +424,7 @@ _10:
 	_worker_trace(tls, _p, str(1239), unsafe.Pointer(bin.Xsqlite3_sql(tls, _pStmt)))
 	_i = i32(0)
 _14:
-	if _i >= (_p.X1) {
+	if _i >= _p.X1 {
 		goto _17
 	}
 	_rc = bin.Xsqlite3_step(tls, _pStmt)
@@ -422,12 +437,12 @@ _14:
 	goto _14
 _17:
 	bin.Xsqlite3_finalize(tls, _pStmt)
-	if (_p.X5) != 0 {
+	if _p.X5 != 0 {
 		goto _3
 	}
-	_worker_delete_all_content(tls, _p, ((_p.X0)+_iOuter)%i32(2))
+	_worker_delete_all_content(tls, _p, (_p.X0+_iOuter)%i32(2))
 	_worker_close_connection(tls, _p)
-	*(*unsafe.Pointer)(unsafe.Pointer(&(_p.X4))) = nil
+	*(*unsafe.Pointer)(unsafe.Pointer(&_p.X4)) = nil
 	_iOuter += 1
 	goto _0
 _3:
@@ -437,26 +452,29 @@ _3:
 	return nil
 }
 
-// Open the database connection for WorkerInfo.  The order in which
-// the files are opened is a function of the tid value.
+// C comment
+//  /*
+//  ** Open the database connection for WorkerInfo.  The order in which
+//  ** the files are opened is a function of the tid value.
+//  */
 func _worker_open_connection(tls *crt.TLS, _p *XWorkerInfo, _iCnt int32) {
 	var _x, _rc int32
 	var _zFile *int8
-	_x = ((_p.X0) + _iCnt) % i32(6)
-	_zFile = bin.Xsqlite3_mprintf(tls, str(1572), int32(*(*uint8)(unsafe.Pointer(uintptr((unsafe.Pointer)((*[3]uint8)(unsafe.Pointer(uintptr((unsafe.Pointer)(&_worker_open_connectionØ00aOrderØ001))+3*uintptr(_x))))) + 1*uintptr(i32(0))))))
-	_check_oom(tls, (unsafe.Pointer)(_zFile))
+	_x = (_p.X0 + _iCnt) % i32(6)
+	_zFile = bin.Xsqlite3_mprintf(tls, str(1572), int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer((*[3]uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&_worker_open_connectionØ00aOrderØ001))+3*uintptr(_x))))) + 1*uintptr(i32(0))))))
+	_check_oom(tls, unsafe.Pointer(_zFile))
 	_worker_trace(tls, _p, str(1586), unsafe.Pointer(_zFile))
-	_rc = bin.Xsqlite3_open_v2(tls, _zFile, (**bin.Xsqlite3)(unsafe.Pointer((*unsafe.Pointer)(unsafe.Pointer(&(_p.X4))))), i32(131074), nil)
+	_rc = bin.Xsqlite3_open_v2(tls, _zFile, (**bin.Xsqlite3)(unsafe.Pointer((*unsafe.Pointer)(unsafe.Pointer(&_p.X4)))), i32(131074), nil)
 	if _rc != i32(0) {
 		crt.Xfprintf(tls, (*crt.XFILE)(Xstderr), str(1594), unsafe.Pointer(_zFile), _p.X0)
 		crt.Xexit(tls, i32(1))
 	}
-	bin.Xsqlite3_free(tls, (unsafe.Pointer)(_zFile))
+	bin.Xsqlite3_free(tls, unsafe.Pointer(_zFile))
 	_run_sql(tls, _p, str(1634))
 	bin.Xsqlite3_busy_timeout(tls, (*bin.Xsqlite3)(_p.X4), i32(10000))
 	_run_sql(tls, _p, str(1662))
-	_run_sql(tls, _p, str(1686), int32(*(*uint8)(unsafe.Pointer(uintptr((unsafe.Pointer)((*[3]uint8)(unsafe.Pointer(uintptr((unsafe.Pointer)(&_worker_open_connectionØ00aOrderØ001))+3*uintptr(_x))))) + 1*uintptr(i32(1))))))
-	_run_sql(tls, _p, str(1717), int32(*(*uint8)(unsafe.Pointer(uintptr((unsafe.Pointer)((*[3]uint8)(unsafe.Pointer(uintptr((unsafe.Pointer)(&_worker_open_connectionØ00aOrderØ001))+3*uintptr(_x))))) + 1*uintptr(i32(2))))))
+	_run_sql(tls, _p, str(1686), int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer((*[3]uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&_worker_open_connectionØ00aOrderØ001))+3*uintptr(_x))))) + 1*uintptr(i32(1))))))
+	_run_sql(tls, _p, str(1717), int32(*(*uint8)(unsafe.Pointer(uintptr(unsafe.Pointer((*[3]uint8)(unsafe.Pointer(uintptr(unsafe.Pointer(&_worker_open_connectionØ00aOrderØ001))+3*uintptr(_x))))) + 1*uintptr(i32(2))))))
 }
 
 var _worker_open_connectionØ00aOrderØ001 [6][3]uint8
@@ -465,7 +483,10 @@ func init() {
 	_worker_open_connectionØ00aOrderØ001 = [6][3]uint8{[3]uint8{u8(1), u8(2), u8(3)}, [3]uint8{u8(1), u8(3), u8(2)}, [3]uint8{u8(2), u8(1), u8(3)}, [3]uint8{u8(2), u8(3), u8(1)}, [3]uint8{u8(3), u8(1), u8(2)}, [3]uint8{u8(3), u8(2), u8(1)}}
 }
 
-// Create rows mn through mx in table iTab for the given worker
+// C comment
+//  /*
+//  ** Create rows mn through mx in table iTab for the given worker
+//  */
 func _worker_add_content(tls *crt.TLS, _p *XWorkerInfo, _mn int32, _mx int32, _iTab int32) {
 	var _zTabDef *int8
 	switch _iTab {
@@ -492,10 +513,13 @@ _4:
 	crt.Xpthread_mutex_lock(tls, (*crt.Xpthread_mutex_t)(_p.X9))
 	_run_sql(tls, _p, str(1799), _mn, _mx, unsafe.Pointer(_zTabDef), _p.X0)
 	crt.Xpthread_mutex_unlock(tls, (*crt.Xpthread_mutex_t)(_p.X9))
-	*(*int32)(unsafe.Pointer(&(_p.X6))) += 1
+	*(*int32)(unsafe.Pointer(&_p.X6)) += 1
 }
 
-// Prepare a single SQL query
+// C comment
+//  /*
+//  ** Prepare a single SQL query
+//  */
 func _prep_sql(tls *crt.TLS, _db unsafe.Pointer, _zFormat *int8, args ...interface{}) (r0 unsafe.Pointer) {
 	var _rc, _i int32
 	var _zSql *int8
@@ -505,7 +529,7 @@ func _prep_sql(tls *crt.TLS, _db unsafe.Pointer, _zFormat *int8, args ...interfa
 	_ap = args
 	_zSql = bin.Xsqlite3_vmprintf(tls, _zFormat, _ap)
 	_ap = nil
-	_check_oom(tls, (unsafe.Pointer)(_zSql))
+	_check_oom(tls, unsafe.Pointer(_zSql))
 	_i = i32(0)
 _0:
 	if _i >= i32(1000) {
@@ -522,24 +546,30 @@ _3:
 		crt.Xfprintf(tls, (*crt.XFILE)(Xstderr), str(991), _rc, bin.Xsqlite3_extended_errcode(tls, (*bin.Xsqlite3)(_db)), unsafe.Pointer(bin.Xsqlite3_errmsg(tls, (*bin.Xsqlite3)(_db))), unsafe.Pointer(_zSql))
 		crt.Xexit(tls, i32(1))
 	}
-	bin.Xsqlite3_free(tls, (unsafe.Pointer)(_zSql))
+	bin.Xsqlite3_free(tls, unsafe.Pointer(_zSql))
 	return _pStmt
 }
 
-// Set an error message on a worker
+// C comment
+//  /*
+//  ** Set an error message on a worker
+//  */
 func _worker_error(tls *crt.TLS, _p *XWorkerInfo, _zFormat *int8, args ...interface{}) {
 	var _ap []interface{}
-	*(*int32)(unsafe.Pointer(&(_p.X5))) += 1
-	bin.Xsqlite3_free(tls, (unsafe.Pointer)(_p.X7))
+	*(*int32)(unsafe.Pointer(&_p.X5)) += 1
+	bin.Xsqlite3_free(tls, unsafe.Pointer(_p.X7))
 	_ap = args
-	*(**int8)(unsafe.Pointer(&(_p.X7))) = bin.Xsqlite3_vmprintf(tls, _zFormat, _ap)
+	*(**int8)(unsafe.Pointer(&_p.X7)) = bin.Xsqlite3_vmprintf(tls, _zFormat, _ap)
 	_ap = nil
 }
 
-// Delete all content in the three databases associated with a
-// single thread.  Make this happen all in a single transaction if
-// inTrans is true, or separately for each database if inTrans is
-// false.
+// C comment
+//  /*
+//  ** Delete all content in the three databases associated with a
+//  ** single thread.  Make this happen all in a single transaction if
+//  ** inTrans is true, or separately for each database if inTrans is
+//  ** false.
+//  */
 func _worker_delete_all_content(tls *crt.TLS, _p *XWorkerInfo, _inTrans int32) {
 	if _inTrans != 0 {
 		crt.Xpthread_mutex_lock(tls, (*crt.Xpthread_mutex_t)(_p.X9))
@@ -549,30 +579,33 @@ func _worker_delete_all_content(tls *crt.TLS, _p *XWorkerInfo, _inTrans int32) {
 		_run_sql(tls, _p, str(2009), _p.X0)
 		_run_sql(tls, _p, str(2037))
 		crt.Xpthread_mutex_unlock(tls, (*crt.Xpthread_mutex_t)(_p.X9))
-		*(*int32)(unsafe.Pointer(&(_p.X6))) += 1
+		*(*int32)(unsafe.Pointer(&_p.X6)) += 1
 		goto _1
 	}
 	crt.Xpthread_mutex_lock(tls, (*crt.Xpthread_mutex_t)(_p.X9))
 	_run_sql(tls, _p, str(1953), _p.X0)
 	crt.Xpthread_mutex_unlock(tls, (*crt.Xpthread_mutex_t)(_p.X9))
-	*(*int32)(unsafe.Pointer(&(_p.X6))) += 1
+	*(*int32)(unsafe.Pointer(&_p.X6)) += 1
 	crt.Xpthread_mutex_lock(tls, (*crt.Xpthread_mutex_t)(_p.X9))
 	_run_sql(tls, _p, str(1981), _p.X0)
 	crt.Xpthread_mutex_unlock(tls, (*crt.Xpthread_mutex_t)(_p.X9))
-	*(*int32)(unsafe.Pointer(&(_p.X6))) += 1
+	*(*int32)(unsafe.Pointer(&_p.X6)) += 1
 	crt.Xpthread_mutex_lock(tls, (*crt.Xpthread_mutex_t)(_p.X9))
 	_run_sql(tls, _p, str(2009), _p.X0)
 	crt.Xpthread_mutex_unlock(tls, (*crt.Xpthread_mutex_t)(_p.X9))
-	*(*int32)(unsafe.Pointer(&(_p.X6))) += 1
+	*(*int32)(unsafe.Pointer(&_p.X6)) += 1
 _1:
 }
 
-// Close the worker database connection
+// C comment
+//  /*
+//  ** Close the worker database connection
+//  */
 func _worker_close_connection(tls *crt.TLS, _p *XWorkerInfo) {
-	if (_p.X4) != nil {
+	if _p.X4 != nil {
 		_worker_trace(tls, _p, str(2044))
 		bin.Xsqlite3_close(tls, (*bin.Xsqlite3)(_p.X4))
-		*(*unsafe.Pointer)(unsafe.Pointer(&(_p.X4))) = nil
+		*(*unsafe.Pointer)(unsafe.Pointer(&_p.X4)) = nil
 	}
 }