Merge branch 'syntacore' into fk-sc/from_upstream

Author: fk-sc

.github/workflows/linux-build.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Install required packages (apt-get)
         run: |
           sudo apt-get update
-          sudo apt-get install clang gcc-multilib
+          sudo apt-get install clang gcc-multilib expect
       - name: Get 32-bit JIM TCL from cache
         id: cache-libjim32
         uses: actions/cache@v4
@@ -60,7 +60,7 @@ jobs:
       - name: Install required packages (apt-get)
         run: |
           sudo apt-get update
-          sudo apt-get install libusb-1.0-0 libusb-1.0-0-dev libjim-dev
+          sudo apt-get install libusb-1.0-0 libusb-1.0-0-dev libjim-dev expect
       - run: ./bootstrap
       - run: ./configure --enable-remote-bitbang --enable-jtag_vpi --enable-ftdi-cjtag --prefix /tmp/${{ env.NAME }}
       - run: make -j`nproc`

.github/workflows/snapshot.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Install needed packages
         run: |
           sudo apt-get update
-          sudo apt-get install autotools-dev autoconf automake libtool pkg-config cmake texinfo texlive g++-mingw-w64-i686
+          sudo apt-get install autotools-dev autoconf automake libtool pkg-config cmake texinfo texlive g++-mingw-w64-i686 expect
       - name: Checkout Code
         uses: actions/checkout@v4
       - run: ./bootstrap

.github/workflows/spike-openocd-tests.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Install packages
         run: |
           sudo apt-get update
-          sudo apt-get install -y device-tree-compiler build-essential libjim-dev
+          sudo apt-get install -y device-tree-compiler build-essential libjim-dev expect
 
       - name: Get revisions of dependencies
         run: |

.gitmodules

@@ -10,7 +10,7 @@ AUTOMAKE_OPTIONS = gnu 1.6
 AM_DISTCHECK_CONFIGURE_FLAGS = --disable-install-jim
 
 # do not run Jim Tcl tests (esp. during distcheck)
-check-recursive: SUBDIRS :=
+check-recursive: SUBDIRS := $(SUBDIRS:jimtcl=)
 
 nobase_dist_pkgdata_DATA = \
 	contrib/libdcc/dcc_stdio.c \
@@ -28,30 +28,25 @@ dist_man_MANS =
 EXTRA_DIST =
 DISTCLEANFILES =
 
-if INTERNAL_JIMTCL
-SUBDIRS += jimtcl
-DIST_SUBDIRS += jimtcl
-EXTRA_DIST += jimtcl/configure.gnu
-# jimtcl from 0.79 to 0.82 miss cleaning jsmn.o
-DISTCLEANFILES += jimtcl/jsmn/jsmn.o
-endif
+SUBDIRS += testing
+DIST_SUBDIRS += testing
+
+SUBDIRS += tools/syntacore
+DIST_SUBDIRS += tools/syntacore
+
+SUBDIRS += testing
+DIST_SUBDIRS += testing
 
 # common flags used in openocd build
 AM_CFLAGS = $(GCC_WARNINGS)
 AM_LDFLAGS =
 
-AM_CPPFLAGS = $(HOST_CPPFLAGS)\
-			  -I$(top_srcdir)/src \
-			  -I$(top_builddir)/src \
-			  -DPKGDATADIR=\"$(pkgdatadir)\" \
-			  -DBINDIR=\"$(bindir)\"
-
-if INTERNAL_JIMTCL
-AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \
-			   -I$(top_builddir)/jimtcl
-else
-AM_CPPFLAGS += $(JIMTCL_CFLAGS)
-endif
+AM_CPPFLAGS = $(HOST_CPPFLAGS) \
+	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src \
+	-DPKGDATADIR=\"$(pkgdatadir)\" \
+	-DBINDIR=\"$(bindir)\" \
+	$(JIMTCL_CFLAGS)
 
 if USE_GCOV
 AM_CFLAGS += --coverage

Makefile.am

@@ -406,19 +406,6 @@ AS_CASE([$host_os],
     ])
 ])
 
-AC_ARG_ENABLE([internal-jimtcl],
-  AS_HELP_STRING([--enable-internal-jimtcl], [Enable building internal jimtcl (deprecated)]),
-  [use_internal_jimtcl=$enableval], [use_internal_jimtcl=no])
-
-AC_ARG_ENABLE([jimtcl-maintainer],
-  AS_HELP_STRING([--enable-jimtcl-maintainer], [Enable maintainer mode when building internal jimtcl]),
-  [use_internal_jimtcl_maintainer=$enableval], [use_internal_jimtcl_maintainer=no])
-
-AC_ARG_ENABLE([internal-libjaylink],
-  AS_HELP_STRING([--enable-internal-libjaylink],
-  [Enable building internal libjaylink]),
-  [use_internal_libjaylink=$enableval], [use_internal_libjaylink=no])
-
 AS_CASE(["${host_cpu}"],
   [i?86|x86*], [],
   [
@@ -579,26 +566,13 @@ AS_IF([test "x$build_gw16012" = "xyes"], [
   AC_DEFINE([BUILD_GW16012], [0], [0 if you don't want the Gateworks GW16012 driver.])
 ])
 
-AS_IF([test "x$use_internal_jimtcl" = "xyes"], [
-  AS_IF([test -f "$srcdir/jimtcl/configure"], [
-    AS_IF([test "x$use_internal_jimtcl_maintainer" = "xyes"], [
-      jimtcl_config_options="--disable-install-jim --with-ext=json --minimal --disable-ssl --maintainer"
-    ], [
-      jimtcl_config_options="--disable-install-jim --with-ext=json --minimal --disable-ssl"
-    ])
-    AX_CONFIG_SUBDIR_OPTION([jimtcl], [$jimtcl_config_options])
+PKG_CHECK_MODULES([JIMTCL], [jimtcl >= 0.79], [
+    have_jimtcl_pkg_config=yes
   ], [
-    AC_MSG_ERROR([jimtcl not found, run git submodule init and git submodule update.])
-  ])
-], [
-  PKG_CHECK_MODULES([JIMTCL], [jimtcl >= 0.79], [
-      have_jimtcl_pkg_config=yes
-    ], [
-      have_jimtcl_pkg_config=no
-      AC_CHECK_HEADER([jim.h], [], [
-        AC_MSG_ERROR([jimtcl is required but not found via pkg-config and system includes])
-      ])
-  ])
+    have_jimtcl_pkg_config=no
+    AC_CHECK_HEADER([jim.h], [], [
+      AC_MSG_ERROR([jimtcl is required but not found via pkg-config and system includes])
+    ])
 ])
 
 PKG_CHECK_MODULES([LIBUSB1], [libusb-1.0], [
@@ -694,7 +668,7 @@ PROCESS_ADAPTERS([LIBFTDI_USB1_ADAPTERS], ["x$use_libftdi" = "xyes" -a "x$use_li
 PROCESS_ADAPTERS([LIBGPIOD_ADAPTERS], ["x$use_libgpiod" = "xyes"], [Linux libgpiod])
 PROCESS_ADAPTERS([SYSFSGPIO_ADAPTER], ["x$is_linux" = "xyes"], [Linux sysfs])
 PROCESS_ADAPTERS([REMOTE_BITBANG_ADAPTER], [true], [unused])
-PROCESS_ADAPTERS([LIBJAYLINK_ADAPTERS], ["x$use_internal_libjaylink" = "xyes" -o "x$use_libjaylink" = "xyes"], [libjaylink-0.2])
+PROCESS_ADAPTERS([LIBJAYLINK_ADAPTERS], ["x$use_libjaylink" = "xyes"], [libjaylink-0.2])
 PROCESS_ADAPTERS([PCIE_ADAPTERS], ["x$is_linux" = "xyes"], [Linux build])
 PROCESS_ADAPTERS([SERIAL_PORT_ADAPTERS], ["x$can_build_buspirate" = "xyes"],
                                          [internal error: validation should happen beforehand])
@@ -730,17 +704,6 @@ AM_CONDITIONAL([HLADAPTER_STLINK], [test "x$enable_stlink" != "xno"])
 AM_CONDITIONAL([HLADAPTER_ICDI], [test "x$enable_ti_icdi" != "xno"])
 AM_CONDITIONAL([HLADAPTER_NULINK], [test "x$enable_nulink" != "xno"])
 
-AS_IF([test "x$enable_jlink" != "xno"], [
-  AS_IF([test "x$use_internal_libjaylink" = "xyes"], [
-    AS_IF([test -f "$srcdir/src/jtag/drivers/libjaylink/configure.ac"], [
-      AX_CONFIG_SUBDIR_OPTION([src/jtag/drivers/libjaylink],
-		[--enable-subproject-build])
-    ], [
-      AC_MSG_ERROR([Internal libjaylink not found, run 'git submodule init' and 'git submodule update'.])
-    ])
-  ])
-])
-
 # Presto needs the bitq module
 AS_IF([test "x$enable_presto" != "xno"], [
   build_bitq=yes
@@ -775,9 +738,7 @@ AM_CONDITIONAL([USE_LIBJAYLINK], [test "x$use_libjaylink" = "xyes"])
 AM_CONDITIONAL([DMEM], [test "x$build_dmem" = "xyes"])
 AM_CONDITIONAL([HAVE_CAPSTONE], [test "x$enable_capstone" != "xno"])
 
-AM_CONDITIONAL([INTERNAL_JIMTCL], [test "x$use_internal_jimtcl" = "xyes"])
 AM_CONDITIONAL([HAVE_JIMTCL_PKG_CONFIG], [test "x$have_jimtcl_pkg_config" = "xyes"])
-AM_CONDITIONAL([INTERNAL_LIBJAYLINK], [test "x$use_internal_libjaylink" = "xyes"])
 
 AM_CONDITIONAL([USE_GCOV], [test "x$enable_gcov" = "xyes"])
 
@@ -836,15 +797,14 @@ AS_IF([test "x$gcc_warnings" = "xyes"], [
 AC_SUBST(EXTRA_DIST_NEWS, ["$(echo $srcdir/NEWS-*)"])
 
 AC_CONFIG_FILES([
-  Makefile
+  Makefile \
+  testing/Makefile \
+  testing/tcl_commands/Makefile \
+  tools/syntacore/Makefile
 ])
+AM_CONDITIONAL([BUILD_USB_RESET], [test "x$is_linux" = "xyes"])
 AC_OUTPUT
 
-AS_IF([test "x$enable_jlink" != "xno"], [
-  AS_IF([test "x$use_internal_libjaylink" = "xyes"], [
-    AC_MSG_WARN([Using the internal libjaylink is deprecated and will not be possible in the future.])
-  ]])
-)
 
 AS_IF([test "x$use_internal_jimtcl" = "xyes"], [
   AC_MSG_WARN([Using the internal jimtcl is deprecated and will not be possible in the future.])

configure.ac

@@ -5092,6 +5092,7 @@ And two debug interfaces cores:
 @item @code{quark_d20xx} -- an Intel Quark D20xx core.
 @item @code{quark_x10xx} -- an Intel Quark X10xx core.
 @item @code{riscv} -- a RISC-V core.
+@item @code{scr5} -- Syntacore SCR5 core.
 @item @code{stm8} -- implements an STM8 core.
 @item @code{testee} -- a dummy target for cases without a real CPU, e.g. CPLD.
 @item @code{xscale} -- this is actually an architecture,
@@ -11873,6 +11874,33 @@ using the @var{riscv exec_progbuf} command to execute fences or CMO instructions
 (RISC-V Cache Management Operations).
 @end deffn
 
+@deffn {Command} {riscv re_examine}
+Enforce (re)examination of target.
+@end deffn
+
+@subsection Syntacore SCR5 target type
+
+Syntacore SCR5 processors implement custom TLB interface. This interface makes
+it possible to set up translation without standart page tables by manipulating
+TLB entries directly.
+
+To make OpenOCD aware of this additional interface, Syntacore SCR5 CPUs should
+use target type @code{scr5}. To configure TLB parameters, the following
+@code{$target_name configure} options are awailable:
+
+@itemize
+@item @code{-scr5-tlb-csr-base} @var{address}
+Specifies the start address of SCR5 TLB CSRs. Defaults to @code{0xbc0}.
+
+@item @code{-scr5-tlb-n-entries} @var{number}
+The number of entries in the cache per chanel. There is no default -- the
+option should be configured.
+
+@item @code{"-scr5-tlb-lookup"} [@option{disable}|@option{enable}]
+Controls TLB lookup. Defaults to @option{enable}.
+
+@end itemize
+
 @section ARC Architecture
 @cindex ARC
 
@@ -12522,6 +12550,32 @@ Instructions often need some time
 to execute before they take effect.
 @end deffn
 
+@deffn {Command} {jtag execute} [@option{scan} @var{tap_name}+
+[@option{-ir} @var{ir_value}+ [@option{-endstate} @var{tap_state}]]
+[@option{-dr} @var{scan_fields}+ [@option{-endstate} @var{tap_state}]]]
+
+Executes a queue of commands:
+@itemize @bullet
+@item @option{scan} queues a JTAG scan.
+@itemize @bullet
+@item A list of TAP names (@var{tap_name}) specifyes active TAPs for the scan.
+@item @option{-ir} indicates instruction register scan.
+@item For an instruction register scan, a single @var{ir_value} should be
+specified for each active TAP.
+@item For an instruction register scan, inactive TAPs are placed into bypass.
+@item @option{-dr} indicates data register scan.
+@item For a data register scan, a single list of fields to scan should be
+specified for each active TAP. Each element of this list (@var{scan_fields})
+should be a coma-separated list of pairs of numbers, separated by a semicolon
+(e.g. 32:0 or 31:0,1:1). The first number in a pair is the number of bits in
+the field. The second one is the value.
+@item For a data register scan, a single bit is shifted into inactive TAPs.
+@item @var{tap_state} specifies the state the in which the chain should end up
+after the scan.
+@end itemize
+@end itemize
+@end deffn
+
 @c tms_sequence (short|long)
 @c ... temporary, debug-only, other than USBprog bug workaround...
 
@@ -12543,8 +12597,8 @@ Default is enabled.
 @cindex TAP state names
 
 The @var{tap_state} names used by OpenOCD in the @command{drscan},
-@command{irscan}, and @command{pathmove} commands are the same
-as those used in SVF boundary scan documents, except that
+@command{irscan}, @command{pathmove}, and @command{jtag execute} commands
+are the same as those used in SVF boundary scan documents, except that
 SVF uses @sc{idle} instead of @sc{run/idle}.
 
 @itemize @bullet

doc/openocd.texi

@@ -14,15 +14,11 @@ bin_PROGRAMS += %D%/openocd
 
 %C%_openocd_LDADD += $(MINGWLDADD)
 
-if INTERNAL_JIMTCL
-%C%_openocd_LDADD += $(top_builddir)/jimtcl/libjim.a
-else
 if HAVE_JIMTCL_PKG_CONFIG
 %C%_openocd_LDADD += $(JIMTCL_LIBS)
 else
 %C%_openocd_LDADD += -ljim
 endif
-endif
 
 %C%_libopenocd_la_CPPFLAGS =
 
@@ -32,12 +28,15 @@ if RELEASE
 %C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"\"
 %C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"\"
 else
-%C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
-%C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
-%C%_libopenocd_la_CPPFLAGS += -DPKGBLDDATE=\"`DATE_FMT=+%F-%R; \
-	SOURCE_DATE_EPOCH="$${SOURCE_DATE_EPOCH:-$$(date +%s)}"; \
-	date -u -d "@$$SOURCE_DATE_EPOCH" "$$DATE_FMT" 2>/dev/null || \
-	date -u -r "$$SOURCE_DATE_EPOCH" "$$DATE_FMT" 2>/dev/null || date -u "$$DATE_FMT"`\"
+mpy_hints_path = $(top_builddir)/makepy_hints.json
+get_version = "import json; print(json.load(open('$(mpy_hints_path)'))['version'])"
+branch = $$(python -c $(get_version) | cut -d'+' -f2- | tr -c '[:alnum:]\n' _)
+revision = $$(git -C $(top_srcdir) rev-parse HEAD | head -c 8)
+maybe_dirty = $$([ -z "$$(git status --untracked-files=no --porcelain)" ] || echo -dirty)
+%C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"-$(branch)-g$(revision)$(maybe_dirty)\"
+riscv_base = $$(git -C $(top_srcdir) merge-base origin/riscv HEAD | head -c 8)
+%C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"riscv-upstream-$(riscv_base)-cs-$(revision)$(maybe_dirty)\"
+%C%_libopenocd_la_CPPFLAGS += -DPKGBLDDATE=\"`date +%F-%R`\"
 endif
 
 # add default CPPFLAGS