This is an automated email from Gerrit. "Bruno Mendes <bd_men...@outlook.com>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/7852
-- gerrit commit 7e160c2ae4d5b5559e1ed1d40b853ffa877b1aed Author: Bruno Mendes <bd_men...@outlook.com> Date: Tue Aug 8 15:17:44 2023 +0100 Since zephyrproject-rtos/zephyr@c3eeae8, Zephyr OS exposes offset of mode_exc_return in the arch struct for ARM. Accounting for this allows for consistency and enables logic with further offsets that may be added after this. Change-Id: I51d90ad5ee8a131bfe851d9a889f764c2f321f10 Signed-off-by: Bruno Mendes <bd_men...@outlook.com> diff --git a/jimtcl b/jimtcl index 1933e5457b..a77ef1a621 160000 --- a/jimtcl +++ b/jimtcl @@ -1 +1 @@ -Subproject commit 1933e5457b9512d39ebbe11ed32578aada149f49 +Subproject commit a77ef1a6218fad4c928ddbdc03c1aedc41007e70 diff --git a/src/jtag/drivers/libjaylink b/src/jtag/drivers/libjaylink index 0d23921a05..9aa7a5957c 160000 --- a/src/jtag/drivers/libjaylink +++ b/src/jtag/drivers/libjaylink @@ -1 +1 @@ -Subproject commit 0d23921a05d5d427332a142d154c213d0c306eb1 +Subproject commit 9aa7a5957c07bb6e862fc1a6d3153d109c7407e4 diff --git a/src/rtos/zephyr.c b/src/rtos/zephyr.c index 934a8dd1cc..a4c60904b5 100644 --- a/src/rtos/zephyr.c +++ b/src/rtos/zephyr.c @@ -57,6 +57,7 @@ enum zephyr_offsets { OFFSET_T_ARCH, OFFSET_T_PREEMPT_FLOAT, OFFSET_T_COOP_FLOAT, + OFFSET_T_ARM_EXC_RETURN, OFFSET_MAX }; diff --git a/tools/commit-msg b/tools/commit-msg new file mode 100755 index 0000000000..a3c00341d0 --- /dev/null +++ b/tools/commit-msg @@ -0,0 +1,104 @@ +#!/bin/sh +# From Gerrit Code Review 3.7.2 +# +# Part of Gerrit Code Review (https://www.gerritcodereview.com/) +# +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -u + +# avoid [[ which is not POSIX sh. +if test "$#" != 1 ; then + echo "$0 requires an argument." + exit 1 +fi + +if test ! -f "$1" ; then + echo "file does not exist: $1" + exit 1 +fi + +# Do not create a change id if requested +if test "false" = "$(git config --bool --get gerrit.createChangeId)" ; then + exit 0 +fi + +# Do not create a change id for squash commits. +if head -n1 "$1" | grep -q '^squash! '; then + exit 0 +fi + +if git rev-parse --verify HEAD >/dev/null 2>&1; then + refhash="$(git rev-parse HEAD)" +else + refhash="$(git hash-object -t tree /dev/null)" +fi + +random=$({ git var GIT_COMMITTER_IDENT ; echo "$refhash" ; cat "$1"; } | git hash-object --stdin) +dest="$1.tmp.${random}" + +trap 'rm -f "$dest" "$dest-2"' EXIT + +if ! git stripspace --strip-comments < "$1" > "${dest}" ; then + echo "cannot strip comments from $1" + exit 1 +fi + +if test ! -s "${dest}" ; then + echo "file is empty: $1" + exit 1 +fi + +reviewurl="$(git config --get gerrit.reviewUrl)" +if test -n "${reviewurl}" ; then + token="Link" + value="${reviewurl%/}/id/I$random" + pattern=".*/id/I[0-9a-f]\{40\}$" +else + token="Change-Id" + value="I$random" + pattern=".*" +fi + +if git interpret-trailers --parse < "$1" | grep -q "^$token: $pattern$" ; then + exit 0 +fi + +# There must be a Signed-off-by trailer for the code below to work. Insert a +# sentinel at the end to make sure there is one. +# Avoid the --in-place option which only appeared in Git 2.8 +if ! git interpret-trailers \ + --trailer "Signed-off-by: SENTINEL" < "$1" > "$dest-2" ; then + echo "cannot insert Signed-off-by sentinel line in $1" + exit 1 +fi + +# Make sure the trailer appears before any Signed-off-by trailers by inserting +# it as if it was a Signed-off-by trailer and then use sed to remove the +# Signed-off-by prefix and the Signed-off-by sentinel line. +# Avoid the --in-place option which only appeared in Git 2.8 +# Avoid the --where option which only appeared in Git 2.15 +if ! git -c trailer.where=before interpret-trailers \ + --trailer "Signed-off-by: $token: $value" < "$dest-2" | + sed -e "s/^Signed-off-by: \($token: \)/\1/" \ + -e "/^Signed-off-by: SENTINEL/d" > "$dest" ; then + echo "cannot insert $token line in $1" + exit 1 +fi + +if ! mv "${dest}" "$1" ; then + echo "cannot mv ${dest} to $1" + exit 1 +fi diff --git a/tools/log b/tools/log new file mode 100644 index 0000000000..9de68960ea --- /dev/null +++ b/tools/log @@ -0,0 +1,11 @@ +--2023-08-08 14:51:54-- https://review.openocd.org/tools/hooks/commit-msg +Resolving review.openocd.org (review.openocd.org)... 176.126.240.71, 2a00:1098:84:26::1 +Connecting to review.openocd.org (review.openocd.org)|176.126.240.71|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 2992 (2.9K) [application/octet-stream] +Saving to: ‘commit-msg’ + + 0K .. 100% 1.64G=0s + +2023-08-08 14:51:54 (1.64 GB/s) - ‘commit-msg’ saved [2992/2992] + --