a resistor subnet has been linked to itself (or something like that).
Otherwise it leads to a double-free and a crash. This commit does
not address why the subnet was linked to itself, and the crash was
preceded by another internal diagnostic message "Missing rptr at ..."
which has been noted before but still needs to be tracked down and
fixed. It is likely that a bad output netlist was created, but at
least magic doesn't segfault.
capacitance of a resistor device between the two terminals. If
the resistor device model contains the capacitance, then the
resistor type should not be included in types that generate
parasitics. If not, then the "pi" model is used. The "tee" model
is still available using "ext2spice resistor tee on". What this
update does is to default to the "pi" model instead of ignoring
the capacitance of the resistor type (e.g., "rm1"), and because
the capacitance of that node is removed after distributing it
between the two terminals, it will no longer produce a "floating"
node in the netlist output.
reading a resistor device which uses the syntax where the resistor
is given a value directly and not as a parameter; (2) allow the
use of "extresist minres 0" (allow resistors in the output no
matter how small). Thanks to Torleif Skaar for finding the issue
with the resistor syntax.
"progress report" of percent completion on certain long-running
processes (namely extraction, DEF reads, and GDS/CIF writes) was
allowing Tcl/Tk events to be processed so that the display would
be repainted and the console window updated to show the progress
instead of hanging. But that was allowing any key macros or
commands to be entered and executed, potentially corrupting the
database while the process was running. I have used
Tk_RestrictEvents() to prevent key and button events from being
processed until afterward. This preserves the display updates
(which do not alter the database) while preventing commands from
being run during one of these long-running processes. Also:
Previously, whenever a long-running process printed the status,
it would not update at the end, leaving output like "52% complete"
being the last output, leaving the impression that the process
never finished. Changed the code so that if any partial progress
is printed, then it will always finish up with the output "100%
complete" so that it is clear to the user that everything went
according to plan.
very major. The filename created had two slashes in the string
("/tmp//MAG...") because the temporary directory already has a slash
in the string. This makes no practical difference but looks odd when
printed to the terminal. The major error is that the Tcl script
that re-establishes the timer after a backup had a typo that caused
the timer never to be reset, resulting in crash backup files that are
created and written once but never again. This egregious error has
now finally been fixed.
a shielded substrate area for devices with terminals connecting to
substrate, search the entire cell hierarchy down to the bottom in
that area, not just the immediate child cell. Also: Reduced the
number of types being searched to ignore types in non-substrate
areas like nwell, although it should not make a practical difference
because those areas should not be searched.
a subcell: A further check is done to see if there are any devices
that interact with the substrate in the shielded area in the same
subcell. If not, then this is a trivial case where a different
substrate area exists but does not impact the subcell and should be
ignored. This change prevents some extraction errors where a substrate
area can get isolated because there was an unrelated substrate area
nearby. Also: Corrected parsing of "dsubckt" types when reading .ext
files; this applies to any device where the optional substrate is
omitted. There are apparently two conflicting methods when a device
doesn't have a substrate: (1) Output "None" for the substrate, or
(2) don't output anything. The 2nd method can be detected by counting
the number of arguments on the line in the .ext file. The extflat/
EFread.c code handles both methods. ResReadExtFile() now does too,
but probably code should be changed to just use method (1) always.
Also: Prevented the "tile not visited" error message in "extresist"
from printing duplicate messages for every device associated with the
same tile. The message can appear when a labeled net has unconnected
regions, and "extract do unique" is not used.
of pull request #527 from Enno, which allows the AppImage workflow
to trigger on a version update when the version number doesn't
start with a "v", as is the case for the repositories on
opencircuitdesign.com.
The AppImage release workflows trigger on any tag (the project tags
releases as e.g. 8.3.662, without a v prefix), but the npm publish
gate in main-wasm.yml required a v-prefixed tag, so a normal release
tag built the AppImages but never published the npm package to GitHub
Packages. The gate now accepts both forms, so a single tag releases
everything.
because this is the default value used if no substrate types are
declared in the tech file; and if so, this would cause an out-
of-bounds check. See Issue #523 on github from Darryl Miles.
The example/suite runners discarded e.stack via console.error(e.message ?? e),
hiding the wasm-function offsets that emsymbolizer needs to map an abort back
to C source. A failing test only printed a terse message like "memory access
out of bounds" with no trace.
- Add reportError() to helpers.js/helpers-tcl.js; print the full stack
(falling back to the message).
- Wrap command execution in runScript() to name the command that aborted
before the error propagates.
- Use reportError() in all standalone runners and in all.js/all-tcl.js
(full stack to stderr, one-line PASS/FAIL summary kept; tests still run
independently).
- build.sh: run the --test step in a subshell so its cd does not leak into
the --pack step.
Add explicit length limit to sscanf in TclmagicRegisterCommands: %92s
instead of %s prevents a potential stack overwrite if a command name
were ever longer than the buffer. Matches the available space (keyword[100]
minus the 7-byte "magic::" prefix minus null).
Extend the CI output-display step to also iterate over output-tcl/ so
that TCL-variant test regressions are visible in the job log without
downloading artifacts.
tclmagic.c: remove stray /*-----*/ line left over from a previous edit
that left a duplicate comment opener before TclmagicRegisterCommands.
magicWasm.c: move TxSetPoint inside the #else (non-TCL) branch of
magic_wasm_source_file and restore its explanation comment. TxSetPoint
routes TxDispatch commands to the layout window; it is irrelevant and
misleading in the Tcl_EvalFile path.
magic/Makefile: guard the TCL linker flags in the magic.js link rule
with ifneq (${TCL_LIB_DIR},). When building the non-TCL WASM variant
TCL_LIB_DIR is empty, so the unconditional -L${TCL_LIB_DIR} -ltclstub
expanded to a bare -L flag and a missing library, breaking the notcl
build.
Replace the last three intubun/tcl mentions with tcltk/tcl in
npm/tcl.js, toolchains/emscripten/build-tcl-wasm.sh, and npm/tcl.ref.
Also remove the stale comment in tcl.ref that referenced a non-existent
update-tcl GitHub Actions workflow.
Rename *-magic.tcl scripts to *-tcl.tcl to match the -tcl.js test naming
convention. Delete the old bare-command pcell.tcl (used cellname create,
no magic:: prefix) and promote pcell-magic.tcl to pcell.tcl.
Fix misleading comment in magicWasm.c: Tclmagic_Init only bootstraps the
interpreter; magic:: commands are registered separately by
TclmagicRegisterCommands after magicMainInit. Align comment block
dashes in TclmagicRegisterCommands to match tclmagic.c style (62 dashes).
Replace intubun/tcl references in build scripts and CI with tcltk/tcl to
match the actual pinned repo in npm/tcl.ref. Also run both test suites
when build.sh is invoked with --test.
All non-TCL tests (extract, gds, drc, cif) now also run against the TCL
variant using magic::-prefixed Tcl scripts. A new PCell test generates
two parameterized rectangle cells and verifies their GDS output.
The CI workflow runs npm run test:tcl after the TCL build and saves the
generated output files as an artifact.
magic_wasm_init() called Tclmagic_Init() and magicMainInit() but never
ran the command-registration loop in _magic_initialize(), so magic::tech,
magic::load, magic::gds and all other Magic commands were missing from
the Tcl interpreter.
Add TclmagicRegisterCommands() in tclmagic.c containing the
WindNextClient/WindGetCommandTable loop and call it from magic_wasm_init()
after magicMainInit() succeeds.
Also change magic_wasm_source_file() to use Tcl_EvalFile in MAGIC_WRAPPER
mode so scripts with magic:: commands are evaluated through the Tcl
interpreter instead of the plain text dispatcher.
Bump VERSION to 8.3.645.
magic.wasm can now be built as two variants packaged in the same npm
release: notcl/ (legacy, magic's own parser) and tcl/ (intubun/tcl 9.x
statically linked, commands evaluated by Tcl_EvalEx). The TCL fork is
pinned via npm/tcl.ref and cloned/built by magic itself — the tcl/
checkout is treated as read-only and built out-of-source into
magic/build-tcl-wasm/.
Configure layer:
- New usingTk variable decoupled from usingTcl in scripts/configure.in
+ scripts/configure, so --with-tcl --without-tk is finally a valid
combination. Native Linux Tcl+Tk builds keep their previous behaviour
(both flags default to enabled).
- When usingTk is empty, configure passes -DMAGIC_NO_TK so the small
number of remaining Tk callsites in tcltk/tclmagic.{h,c} compile out,
and TKCOMMON_SRCS / USE_TK_STUBS are omitted from the link.
WASM build orchestration:
- toolchains/emscripten/build-tcl-wasm.sh builds libtcl9.x.a + libtclstub.a
+ tclConfig.sh out-of-source from a pristine intubun/tcl checkout.
- npm/build.sh grew a --variant=<tcl|notcl|both> flag and writes its
outputs into npm/tcl/ and npm/notcl/. It also clones intubun/tcl with
autocrlf=false at the SHA pinned by npm/tcl.ref.
- magic/Makefile (WASM block only): magicWasm.o is now compiled with
DFLAGS_NOSTUB so Tcl_CreateInterp resolves to libtcl9.x directly
before tclStubsPtr is set. magic.js link pulls in LIB_SPECS_NOSTUB
and -ltclstub. After rules.mak include, magic: is a phony alias for
magic.js so the generic ${MODULE} recipe doesn't fight it.
- toolchains/emscripten/defs.mak: add -sUSE_ZLIB=1 (libtcl9 references
zlib), replace -sSTACK_SIZE=N with -Wl,-z,stack-size=N (emcc >=5
rejects the setting form).
- magic/magicWasm.c bootstraps the embedded interp under MAGIC_WRAPPER
(Tcl_CreateInterp -> Tcl_Init -> Tclmagic_Init) and routes
run_command through Tcl_EvalEx.
- magic/magicTop.c: gate MagicVersion/Revision/CompileTime on
!MAGIC_WRAPPER so they don't collide with the copies in
tcltk/tclmagic.c when both objects land in the same wasm binary.
npm package:
- Subpath exports: ".", "./tcl", "./notcl". Default import keeps the
pre-existing non-TCL behaviour for backward compatibility.
- examples/smoke-tcl.mjs exercises the TCL variant.
CI:
- main-wasm.yml clones intubun/tcl at the pinned ref, builds both
variants via npm/build.sh --variant=both, runs the existing notcl
test suite and the new TCL smoke test, and publishes only on a
v<x.y.z>... git tag. Tag name (minus the leading v) becomes the
npm version.
a warning appropriate for duplicate points and not a path
reversal warning. Modified the output for path reversal or
duplicate point errors so that the coordinate is in GDS units
and not path units (which are multiplied by 2).
This uses environment variable PDK_ROOT to search for available
technologies, and loads them by sourcing the .magicrc file instead
of using "tech load". However, there are currently some caveats:
(1) The device generators do not immediately appear in the window
menu; a new window must be created for the extra menu buttons to
be added; (2) Once a PDK sets up the menus, they cannot be
revised. Switching to another technology causes the extra menu
items to not appear at all. Both issues need to be addressed.
Corrected an error that was caused by moving the handling of the
"Short"-type device from "extract" to "ext2spice". When running
with "ext2spice extresist on", the "Short" device is read twice.
Since it's being treated like an "equiv" statement, it's very
important to do the node merge only for the device as it appears
in the ".res.ext" file, and ignore the entry in ".ext", or the
wrong nodes may get merged. This appears to be the last major
error lurking in the "extresist" code, as I am now able to run
full R-C extraction on an entire chip, in reasonable time.
ambiguity in the tech file and therefore also in the .ext file.
This is easy to resolve and it was only necessary to change the
type after finding the tile belonging to the device. There are
pathological cases where this might still go wrong, like defining
a "short" device name for metal resistors on any plane; then,
if a "short" device overlaps something on another plane, it might
be given the wrong type. Avoiding all ambiguity would require
adding an extra item to "device" lines in the .ext file output;
the short plane name would be most efficient.
and not being used. Corrected one other obscure error in which
reading the .ext file picks up the wrong device type because it
is possible to have multiple types map to the same device name.
This is easy to detect and fix in place.
that the check for the "starting device" was not checking if a
terminal was substrate, and so was treating it as a terminal,
which would cause the extraction starting point to be set on the
wrong plane, along with probably other unwanted behavior.
Ignoring substrate terminals when checking for current drivers
solved the problem. Also: Removed some code that had been
reworked but was still sitting in an "#ifdef 0" block.
time-consuming (note the commit message "There are still likely much
better ways to do this"). Worked out a method of hashing the location
of terminals on other planes so that they can be looked up from the
address of the tile. This requires only one pass through the devices
to locate and record the terminals, and no loops through devices when
processing tiles. Also corrected the positioning of the substrate
terminal to be the center position of the device tile, not the substrate
tile. This not only better represents the substrate connections, but
it also eliminates the condition in which many thousands of resistors
converge on the same point, which causes stack overflow. With the
current scheme, stack overflow is unlikely to occur.
several more questionable methods and allows extresist to find
devices above nets that are part of substrate planes or terminals
that exist on planes other than the device (like diodes, often).
There are still likely much better ways to do this.
checking device terminals in "extresist", leading to incorrect
assignments for devices with only 3 terminals, or for asymmetric
FETs. Corrected "select area label" which had stopped working from
a handful of commits back when the "select" command was corrected for
visible/invisible labels and cells. Corrected the "extresist mindelay"
command option parsing, which was not allowing mindelay to be set to 0.
"tagged <text>" without any additional arguments, to indicate
that the operator should look for text that overlaps the
current layer. That allows handling the case were a text tag
is sitting over space inside a cell, which otherwise would not
be able to be searched. Also corrected a likely issue in which
point labels could not be used as tags because they have no
area to search under.
the output if they reference a killed node. This will result in an
invalid netlist, but at least now all devices are represented in the
output, and a warning is issued about the error. There are still
multiple problems that need to be tracked down and fixed. Most
problems are stemming from the unusual "Short" device handling.
long-standing problem, in which the resistance extraction attempts
to determine the device type of each device. Which is stupid,
because the original extraction process has already done this, and
the information is readily available in the .ext file. This update
allows "extresist" to get all the device information from the .ext
file, so there is no guesswork and no extra time spent trying.
Unfortunately, it does not solve the problem I expected it to solve,
which is the disappearance of _dss and moscap devices from gf180mcu
netlists. More work to do. . .
"lasttop" after a new heap has been allocated and "top" is reset.
This is a minor issue, as even random data at the top of the
newly allocated heap is vanishingly unlikely to make a match,
but valgrind caught it as a use of unallocated memory, and it
should be fixed.
one place as ohms and another as milliohms. Changed it to be
milliohms always, except when written as output to the lumped
resistance file or as diagnostic output. The result makes more
sense, but now has the issue that the maximum resistance is always
an over-estimate and may need to account for resistances in
parallel.
R. Timothy Edwards
Enno Schnackenberg
Gon Solo
Intubun
Torleif Skår