Overview
Comment: | Merged in alternate trunk from old development |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
75e4d5fbed3b1022159ff937586fe21b |
User & Date: | rkeene on 2014-05-05 16:22:07.039 |
Other Links: | manifest | tags |
References
2014-05-05
| ||
21:12 | Reverted [75e4d5fbed] and updated to do integration work in our driver directly check-in: cbac5b0590 user: rkeene tags: trunk | |
Context
2014-05-05
| ||
16:29 | Fixed incorrectly applied previous commit check-in: 4e6359ae47 user: rkeene tags: trunk | |
16:22 | Merged in alternate trunk from old development check-in: 75e4d5fbed user: rkeene tags: trunk | |
2014-05-04
| ||
07:27 | Updated ignores with Win32 targets check-in: 1ffb02b806 user: rkeene tags: trunk | |
2014-05-01
| ||
22:10 | Updated to download "tcc" into "tcc" directory check-in: 9474ae442e user: rkeene tags: trunk | |
Changes
Added .fossil-settings/ignore-glob version [163df1cbc6].
Added COPYING version [fdeb196b87].
Modified build/autogen.sh
from [257c5a2cf3]
to [95541498bc].
1 2 3 4 5 6 7 8 9 10 11 | #! /bin/bash # Download latest copy of autoconf macros ( cd aclocal || exit 1 for file in shobj.m4 tcl.m4 versionscript.m4; do rm -f "${file}" wget -O "${file}.new" "http://rkeene.org/devel/autoconf/${file}" || continue | > | 1 2 3 4 5 6 7 8 9 10 11 12 | #! /bin/bash # Download latest copy of autoconf macros ( mkdir aclocal >/dev/null 2>/dev/null cd aclocal || exit 1 for file in shobj.m4 tcl.m4 versionscript.m4; do rm -f "${file}" wget -O "${file}.new" "http://rkeene.org/devel/autoconf/${file}" || continue |
︙ | ︙ |
Added build/makearch.info version [38688ff634].
Added build/tcc-patches/0.9.26/tcc-0.9.26-tcl.diff version [e03734effa].
Added build/tcc-patches/0.9.26/tcc-0.9.26-tclio.diff version [8fe78dd24b].
Added headers.awk version [ea9e38a74d].
Modified pkgIndex.tcl.in
from [da39a3ee5e]
to [00c586db9f].
> | 1 | package ifneeded tcc4tcl @PACKAGE_VERSION@ [list source [file join $dir tcc4tcl.tcl]] |
Renamed and modified
tcltcc.c
[f5d4fd88e2]
to tcc4tcl.c
[aa505b066c].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | /* * TclTCC - Tcl binding to Tiny C Compiler * * Copyright (c) 2007 Mark Janssen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ | > > > > > > > > > > | | < | > | > | > | | | | > | | > | > | | > | | > | | < | | | | | | | | | | > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | /* * TclTCC - Tcl binding to Tiny C Compiler * * Copyright (c) 2007 Mark Janssen * Copyright (c) 2014 Roy Keene * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <tcl.h> #include <stdlib.h> #include "tcc.h" struct TclTCCState { TCCState *s; int relocated; }; static void Tcc4tclErrorFunc(Tcl_Interp * interp, char * msg) { Tcl_AppendResult(interp, msg, "\n", NULL); } static void Tcc4tclCCommandDeleteProc (ClientData cdata) { struct TclTCCState *ts; TCCState *s ; ts = (struct TclTCCState *) cdata; s = ts->s; /* We can delete the compiler if the output was not to memory */ if (s->output_type != TCC_OUTPUT_MEMORY) { tcc_delete(s); ts->s = NULL; } ckfree((void *) ts); } static int Tcc4tclHandleCmd ( ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[]){ unsigned long val; void *val_p; int index; int res; struct TclTCCState *ts; TCCState *s; Tcl_Obj *sym_addr; static CONST char *options[] = { "add_include_path", "add_file", "add_library", "add_library_path", "add_symbol", "command", "compile", "define", "get_symbol", "output_file", "undefine", (char *) NULL }; enum options { TCLTCC_ADD_INCLUDE, TCLTCC_ADD_FILE, TCLTCC_ADD_LIBRARY, TCLTCC_ADD_LIBRARY_PATH, TCLTCC_ADD_SYMBOL, TCLTCC_COMMAND, TCLTCC_COMPILE, TCLTCC_DEFINE, TCLTCC_GET_SYMBOL, TCLTCC_OUTPUT_FILE, TCLTCC_UNDEFINE }; ts = (struct TclTCCState *) cdata; s = ts->s; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "subcommand arg ?arg ...?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0, |
︙ | ︙ | |||
93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "path"); return TCL_ERROR; } else { tcc_add_library_path(s, Tcl_GetString(objv[2])); return TCL_OK; } case TCLTCC_ADD_SYMBOL: if (objc != 4) { Tcl_WrongNumArgs(interp, 2, objv, "symbol value"); return TCL_ERROR; } Tcl_GetLongFromObj(interp,objv[3], &val); tcc_add_symbol(s,Tcl_GetString(objv[2]),val); return TCL_OK; case TCLTCC_COMMAND: if (objc != 4) { Tcl_WrongNumArgs(interp, 2, objv, "tclname cname"); return TCL_ERROR; } | > > > | | | > | > | | | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 | if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "path"); return TCL_ERROR; } else { tcc_add_library_path(s, Tcl_GetString(objv[2])); return TCL_OK; } #if 0 case TCLTCC_ADD_SYMBOL: if (objc != 4) { Tcl_WrongNumArgs(interp, 2, objv, "symbol value"); return TCL_ERROR; } Tcl_GetLongFromObj(interp,objv[3], &val); tcc_add_symbol(s,Tcl_GetString(objv[2]),val); return TCL_OK; #endif case TCLTCC_COMMAND: if (objc != 4) { Tcl_WrongNumArgs(interp, 2, objv, "tclname cname"); return TCL_ERROR; } if (!ts->relocated) { if(tcc_relocate(s, TCC_RELOCATE_AUTO)!=0) { Tcl_AppendResult(interp, "relocating failed", NULL); return TCL_ERROR; } else { ts->relocated=1; } } val_p = tcc_get_symbol(s, Tcl_GetString(objv[3])); if (val_p == NULL) { Tcl_AppendResult(interp, "symbol '", Tcl_GetString(objv[3]),"' not found", NULL); return TCL_ERROR; } /*printf("symbol: %x\n",val); */ Tcl_CreateObjCommand(interp,Tcl_GetString(objv[2]),val_p,NULL,NULL); return TCL_OK; case TCLTCC_COMPILE: if(ts->relocated == 1) { Tcl_AppendResult(interp, "code already relocated, cannot compile more",NULL); return TCL_ERROR; } if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "ccode"); return TCL_ERROR; } else { |
︙ | ︙ | |||
154 155 156 157 158 159 160 | tcc_define_symbol(s,Tcl_GetString(objv[2]),Tcl_GetString(objv[3])); return TCL_OK; case TCLTCC_GET_SYMBOL: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "symbol"); return TCL_ERROR; } | | | | | > | | < < < < | > | > | | | | | | | | > | | | | < | | > > > > > > | < | > > > | > | | | | | < > | | | < < | | | > > | | 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 | tcc_define_symbol(s,Tcl_GetString(objv[2]),Tcl_GetString(objv[3])); return TCL_OK; case TCLTCC_GET_SYMBOL: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "symbol"); return TCL_ERROR; } if (!ts->relocated) { if(tcc_relocate(s, TCC_RELOCATE_AUTO)!=0) { Tcl_AppendResult(interp, "relocating failed", NULL); return TCL_ERROR; } else { ts->relocated=1; } } val_p = tcc_get_symbol(s,Tcl_GetString(objv[2])); if(val_p == NULL) { Tcl_AppendResult(interp, "symbol '", Tcl_GetString(objv[2]),"' not found", NULL); return TCL_ERROR; } sym_addr = Tcl_NewWideIntObj((Tcl_WideInt) val_p); Tcl_SetObjResult(interp, sym_addr); return TCL_OK; case TCLTCC_OUTPUT_FILE: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "filename"); return TCL_ERROR; } if (ts->relocated) { Tcl_AppendResult(interp, "code already relocated, cannot output to file", NULL); return TCL_ERROR; } if (s->output_type == TCC_OUTPUT_MEMORY) { Tcl_AppendResult(interp, "output_type memory not valid for output to file", NULL); return TCL_ERROR; } res = tcc_output_file(s,Tcl_GetString(objv[2])); if (res!=0) { Tcl_AppendResult(interp, "output to file failed", NULL); return TCL_ERROR; } else { return TCL_OK; } case TCLTCC_UNDEFINE: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "symbol"); return TCL_ERROR; } tcc_undefine_symbol(s,Tcl_GetString(objv[2])); return TCL_OK; default: Tcl_Panic("internal error during option lookup"); } return TCL_OK; } static int Tcc4tclCreateCmd( ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[]){ struct TclTCCState *ts; TCCState *s; int index; static CONST char *types[] = { "memory", "exe", "dll", "obj", "preprocess", (char *) NULL }; if (objc < 3 || objc > 4) { Tcl_WrongNumArgs(interp, 1, objv, "tcc_libary_path ?output_type? handle"); return TCL_ERROR; } if (objc == 3) { index = TCC_OUTPUT_MEMORY; } else { if (Tcl_GetIndexFromObj(interp, objv[2], types, "type", 0, &index) != TCL_OK) { return TCL_ERROR; } } s = tcc_new(Tcl_GetString(objv[1])); if (s == NULL) { return(TCL_ERROR); } tcc_set_error_func(s, interp, (void *)&Tcc4tclErrorFunc); ts = (void *) ckalloc(sizeof(*ts)); ts->s = s; ts->relocated = 0; /*printf("type: %d\n", index); */ tcc_set_output_type(s,index); Tcl_CreateObjCommand(interp,Tcl_GetString(objv[objc-1]),Tcc4tclHandleCmd,ts,Tcc4tclCCommandDeleteProc); return TCL_OK; } int Tcc4tcl_Init(Tcl_Interp *interp) { #ifdef USE_TCL_STUBS if (Tcl_InitStubs(interp, "8.4" , 0) == 0L) { return TCL_ERROR; } #endif Tcl_CreateObjCommand(interp, PACKAGE_NAME, Tcc4tclCreateCmd, NULL, NULL); Tcl_PkgProvide(interp, PACKAGE_NAME, PACKAGE_VERSION); return TCL_OK; } |
Added tcc4tcl.syms.in version [98fca54777].
Renamed and modified
tcc.tcl
[b543309b89]
to tcc4tcl.tcl
[271b665fc7].
1 2 | # tcc.tcl - library routines for the tcc wrapper (Mark Janssen) | | | | | < | < < < | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | # tcc.tcl - library routines for the tcc wrapper (Mark Janssen) namespace eval tcc4tcl { variable dir variable libs variable includes variable count variable command_count variable commands set dir [file dirname [info script]] if {[info command ::tcc4tcl] == ""} { catch { load {} tcc4tcl } } if {[info command ::tcc4tcl] == ""} { load [file join $dir tcc4tcl[info sharedlibextension]] tcc4tcl } set libs $dir/lib set includes $dir/include set count 0 set command_count 0 array set commands {} proc new {} { variable dir variable count set handle tcc_[incr count] tcc4tcl $dir $handle return tcc_$count } proc tclcommand {handle name ccode} { variable commands variable command_count set cname _tcc_tcl_command_[incr command_count] set code {#include "tcl.h"} |
︙ | ︙ | |||
53 54 55 56 57 58 59 | set tclcommand [join [lrange [split $cmd ,] 1 end] {}] set handle [lindex [split $cmd ,] 0] $handle command $tclcommand $cname } return } } | | | < < | | | | | | | | | < < | | | | | | | | | | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 | set tclcommand [join [lrange [split $cmd ,] 1 end] {}] set handle [lindex [split $cmd ,] 0] $handle command $tclcommand $cname } return } } proc tcc4tcl::to_dll {code dll {libs {}}} { tcc4tcl $::tcc4tcl::dir dll tcc_1 foreach lib $libs {tcc_1 add_library $lib} if {$::tcl_platform(platform) eq "windows"} { tcc_1 define DLL_EXPORT {__declspec(dllexport)} set f [open $::tcc4tcl::dir/c/dllcrt1.c] tcc_1 compile [read $f] close $f set f [open $::tcc4tcl::dir/c/dllmain.c] tcc_1 compile [read $f] close $f } else { tcc_1 define DLL_EXPORT "" } tcc_1 compile $code tcc_1 output_file $dll rename tcc_1 {} } proc ::tcc4tcl::Log {args} { # puts $args } proc ::tcc4tcl::reset {} { variable tcc set tcc(code) "" set tcc(cfiles) [list] set tcc(tk) 0 } # Custom helpers proc ::tcc4tcl::checkname {n} {expr {[regexp {^[a-zA-Z0-9_]+$} $n] > 0}} proc ::tcc4tcl::cleanname {n} {regsub -all {[^a-zA-Z0-9_]+} $n _} proc ::tcc4tcl::ccode {code} { variable tcc Log "INJECTING CCODE" append tcc(code) $code \n } proc ::tcc4tcl::cc {code} { variable tcc if {![info exists tcc(cc)]} { set tcc(cc) tcc1 tcc4tcl $::tcc4tcl::dir $tcc(cc) } Log code:$code $tcc(cc) compile $code } #----------------------------------------------------------- New DLL API proc ::tcc4tcl::dll {{name ""}} { variable count if {$name eq ""} {set name dll[incr count]} namespace eval ::tcc4tcl::dll::$name { variable code "#include <tcl.h>\n" ;# always needed variable cmds {} } proc ::$name {cmd args} "::tcc4tcl::dll::\$cmd $name \$args" return $name } namespace eval ::tcc4tcl::dll {} proc ::tcc4tcl::dll::ccode {name argl} { append ${name}::code \n [lindex $argl 0] return } proc ::tcc4tcl::dll::cproc {name argl} { foreach {pname pargs rtype body} $argl break set code [::tcc4tcl::wrapCmd $pname $pargs $rtype cx_$pname $body] lappend ${name}::cmds $pname cx_$pname append ${name}::code \n $code return } proc ::tcc4tcl::dll::write {name argl} { set (-dir) . set (-code) "" ;# possible extra code to go into the _Init function set (-libs) "" set (-name) [string tolower $name] array set "" $argl append ${name}::code \n \ [::tcc4tcl::wrapExport $(-name) [set ${name}::cmds] $(-code)] set outfile $(-dir)/$(-name)[info sharedlibextension] ::tcc4tcl::to_dll [set ${name}::code] $outfile $(-libs) } #--------------------------------------------------------------------- proc ::tcc4tcl::wrap {name adefs rtype {body "#"}} { set cname c_$name set wname tcl_$name array set types {} set names {} set cargs {} set cnames {} # if first arg is "Tcl_Interp*", pass it without counting it as a cmd arg |
︙ | ︙ | |||
265 266 267 268 269 270 271 | } if {$rtype != "ok"} {append cbody " return TCL_OK;" \n} #puts ----code:\n$code #puts ----cbody:\n$cbody list $code $cbody } | | | | | | 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 | } if {$rtype != "ok"} {append cbody " return TCL_OK;" \n} #puts ----code:\n$code #puts ----cbody:\n$cbody list $code $cbody } proc ::tcc4tcl::wrapCmd {tclname argl rtype cname body} { foreach {code cbody} [wrap $tclname $argl $rtype $body] break append code "\nstatic int $cname" append code {(ClientData cdata,Tcl_Interp *ip, int objc,Tcl_Obj* CONST objv[])} " \{" append code \n$cbody \n\}\n } proc ::tcc4tcl::wrapExport {name cmds {body ""}} { set code "DLL_EXPORT int [string totitle $name]_Init(Tcl_Interp *interp)" append code " \{\n" foreach {tclname cname} $cmds { append code \ "Tcl_CreateObjCommand(interp,\"$tclname\",$cname,NULL,NULL);\n" } append code $body append code "\nreturn TCL_OK;\n\}" } #--------------------------------------------------------------------- proc ::tcc4tcl::cproc {name adefs rtype {body "#"}} { foreach {code cbody} [wrap $name $adefs $rtype $body] break ccode $code set ns [namespace current] uplevel 1 [list ${ns}::ccommand $name {dummy ip objc objv} $cbody] } #--------------------------------------------------------------------- proc ::tcc4tcl::cdata {name data} { # Extract bytes from data binary scan $data c* bytes set inittext "\n" set line "" set n 0 set l 0 foreach c $bytes { |
︙ | ︙ | |||
321 322 323 324 325 326 327 | append cbody "Tcl_SetByteArrayObj(Tcl_GetObjResult(ip), (unsigned char*) script, $count);\n" append cbody "return TCL_OK;" "\n" set ns [namespace current] uplevel 1 [list ${ns}::ccommand $name {dummy ip objc objv} $cbody] return $name } #------------------------------------------------------------------- | | | 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 | append cbody "Tcl_SetByteArrayObj(Tcl_GetObjResult(ip), (unsigned char*) script, $count);\n" append cbody "return TCL_OK;" "\n" set ns [namespace current] uplevel 1 [list ${ns}::ccommand $name {dummy ip objc objv} $cbody] return $name } #------------------------------------------------------------------- proc ::tcc4tcl::ccommand {procname anames args} { variable tcc # Fully qualified proc name if {[string match "::*" $procname]} { # procname is already absolute } else { set nsfrom [uplevel 1 {namespace current}] if {$nsfrom eq "::"} {set nsfrom ""} |
︙ | ︙ | |||
365 366 367 368 369 370 371 | append code "}" "\n" set ns [namespace current] uplevel 1 [list ${ns}::cc $code] Log "CREATING TCL COMMAND $procname / $cname" uplevel 1 [list $tcc(cc) command $procname $cname] unset tcc(cc) ;# can't be used for compiling anymore } | | | | | 357 358 359 360 361 362 363 364 365 366 367 368 369 370 | append code "}" "\n" set ns [namespace current] uplevel 1 [list ${ns}::cc $code] Log "CREATING TCL COMMAND $procname / $cname" uplevel 1 [list $tcc(cc) command $procname $cname] unset tcc(cc) ;# can't be used for compiling anymore } proc ::tcc4tcl::tk {args} { variable tcc set tcc(tk) 1 } ::tcc4tcl::reset namespace eval tcc4tcl {namespace export cproc ccode cdata} |
Added test version [c72233bf30].