From 57785e5eca8a8518b541677ea2ab118d056cc60b Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Tue, 1 Mar 2022 18:56:32 +0700 Subject: [PATCH 1/2] espcoredump: suppress -Waddress-of-packed-member warning --- .../espcoredump/src/port/xtensa/core_dump_port.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/components/espcoredump/src/port/xtensa/core_dump_port.c b/components/espcoredump/src/port/xtensa/core_dump_port.c index 646840c1fd..d57faf84e5 100644 --- a/components/espcoredump/src/port/xtensa/core_dump_port.c +++ b/components/espcoredump/src/port/xtensa/core_dump_port.c @@ -156,7 +156,12 @@ static void *esp_core_dump_get_fake_stack(uint32_t *stk_len) static core_dump_reg_pair_t *esp_core_dump_get_epc_regs(core_dump_reg_pair_t* src) { +#pragma GCC diagnostic push +#if __GNUC__ >= 9 +#pragma GCC diagnostic ignored "-Waddress-of-packed-member" +#endif uint32_t* reg_ptr = (uint32_t*)src; +#pragma GCC diagnostic pop // get InterruptException program counter registers COREDUMP_GET_EPC(EPC_1, reg_ptr); COREDUMP_GET_EPC(EPC_2, reg_ptr); @@ -170,7 +175,12 @@ static core_dump_reg_pair_t *esp_core_dump_get_epc_regs(core_dump_reg_pair_t* sr static core_dump_reg_pair_t *esp_core_dump_get_eps_regs(core_dump_reg_pair_t* src) { +#pragma GCC diagnostic push +#if __GNUC__ >= 9 +#pragma GCC diagnostic ignored "-Waddress-of-packed-member" +#endif uint32_t* reg_ptr = (uint32_t*)src; +#pragma GCC diagnostic pop // get InterruptException processor state registers COREDUMP_GET_EPS(EPS_2, reg_ptr); COREDUMP_GET_EPS(EPS_3, reg_ptr); From 45f267390b10c7a7be9418cadc2569a59738a706 Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Tue, 1 Mar 2022 19:00:18 +0700 Subject: [PATCH 2/2] espcoredump: fix unsigned arithmetic --- .../src/port/riscv/core_dump_port.c | 22 +++++++------------ .../src/port/xtensa/core_dump_port.c | 4 +++- tools/ci/check_copyright_ignore.txt | 1 - 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/components/espcoredump/src/port/riscv/core_dump_port.c b/components/espcoredump/src/port/riscv/core_dump_port.c index 3b2a4f63ea..f5370c2d01 100644 --- a/components/espcoredump/src/port/riscv/core_dump_port.c +++ b/components/espcoredump/src/port/riscv/core_dump_port.c @@ -1,16 +1,8 @@ -// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD -// -// 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. +/* + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ /** * @file @@ -40,6 +32,7 @@ const static DRAM_ATTR char TAG[] __attribute__((unused)) = "esp_core_dump_port" #if CONFIG_ESP_COREDUMP_ENABLE #define min(a,b) ((a) < (b) ? (a) : (b)) +#define max(a,b) ((a) < (b) ? (b) : (a)) /** * Union representing the registers of the CPU as they will be written @@ -259,8 +252,9 @@ bool esp_core_dump_check_stack(core_dump_task_header_t *task) uint32_t esp_core_dump_get_stack(core_dump_task_header_t *task, uint32_t* stk_vaddr, uint32_t* stk_paddr) { - const uint32_t stack_len = abs(task->stack_start - task->stack_end); const uint32_t stack_addr = min(task->stack_start, task->stack_end); + const uint32_t stack_addr2 = max(task->stack_start, task->stack_end); + const uint32_t stack_len = stack_addr2 - stack_addr; ESP_COREDUMP_DEBUG_ASSERT(stk_paddr != NULL && stk_vaddr != NULL); diff --git a/components/espcoredump/src/port/xtensa/core_dump_port.c b/components/espcoredump/src/port/xtensa/core_dump_port.c index d57faf84e5..e0f4cddc32 100644 --- a/components/espcoredump/src/port/xtensa/core_dump_port.c +++ b/components/espcoredump/src/port/xtensa/core_dump_port.c @@ -24,6 +24,7 @@ const static DRAM_ATTR char TAG[] __attribute__((unused)) = "esp_core_dump_port"; #define min(a,b) ((a) < (b) ? (a) : (b)) +#define max(a,b) ((a) < (b) ? (b) : (a)) #define COREDUMP_EM_XTENSA 0x5E #define COREDUMP_INVALID_CAUSE_VALUE 0xFFFF @@ -349,8 +350,9 @@ bool esp_core_dump_mem_seg_is_sane(uint32_t addr, uint32_t sz) uint32_t esp_core_dump_get_stack(core_dump_task_header_t *task, uint32_t* stk_vaddr, uint32_t* stk_paddr) { - const uint32_t stack_len = abs(task->stack_start - task->stack_end); const uint32_t stack_addr = min(task->stack_start, task->stack_end); + const uint32_t stack_addr2 = max(task->stack_start, task->stack_end); + const uint32_t stack_len = stack_addr2 - stack_addr; ESP_COREDUMP_DEBUG_ASSERT(stk_paddr != NULL && stk_vaddr != NULL); diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index d358374a2d..5d019c5712 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -728,7 +728,6 @@ components/espcoredump/include_core_dump/port/xtensa/esp_core_dump_port_impl.h components/espcoredump/src/core_dump_binary.c components/espcoredump/src/core_dump_flash.c components/espcoredump/src/core_dump_uart.c -components/espcoredump/src/port/riscv/core_dump_port.c components/espcoredump/test_apps/main/test_core_dump.c components/fatfs/diskio/diskio.c components/fatfs/diskio/diskio_impl.h