target/espressif: check common_magic instead of gdb_arch string 36/7536/2
authorErhan Kurubas <erhan.kurubas@espressif.com>
Tue, 14 Mar 2023 22:22:10 +0000 (01:22 +0300)
committerAntonio Borneo <borneo.antonio@gmail.com>
Sat, 25 Mar 2023 18:06:36 +0000 (18:06 +0000)
The value returned by target_get_gdb_arch() is something specific for GDB.
There could be several variants of the same CPU.
If we start implementing all the variants, checking the string value,
could become incorrect.
It's better to check for xtensa->common_magic == XTENSA_COMMON_MAGIC

Signed-off-by: Erhan Kurubas <erhan.kurubas@espressif.com>
Change-Id: I20f3fdced176c3b9ab00f889743161ecad7280f9
Reviewed-on: https://review.openocd.org/c/openocd/+/7536
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
src/target/espressif/esp_semihosting.c

index 5e9cb94573534a037aa237b22516190c7ecf2b0d..51d499866d382a9a77094931cb76ad2ced3e598e 100644 (file)
 
 static struct esp_semihost_data __attribute__((unused)) *target_to_esp_semihost_data(struct target *target)
 {
-       const char *arch = target_get_gdb_arch(target);
-       if (arch) {
-               if (strncmp(arch, "xtensa", 6) == 0)
-                       return &target_to_esp_xtensa(target)->semihost;
-               /* TODO: add riscv */
-       }
+       struct xtensa *xtensa = target->arch_info;
+       if (xtensa->common_magic == XTENSA_COMMON_MAGIC)
+               return &target_to_esp_xtensa(target)->semihost;
+       /* TODO: add riscv */
        LOG_ERROR("Unknown target arch!");
        return NULL;
 }

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)