target: add generic Xtensa LX support

[openocd.git] / src / target / target.c

diff --git a/src/target/target.c b/src/target/target.c
index 78073f68070cb37e923bfb5d794ec2eb17c04a88..9b07dbf6185fc98e2b90c6c9125cb0bc11d073dd 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -77,6 +77,7 @@ extern struct target_type fa526_target;
 extern struct target_type feroceon_target;
 extern struct target_type dragonite_target;
 extern struct target_type xscale_target;
+extern struct target_type xtensa_chip_target;
 extern struct target_type cortexm_target;
 extern struct target_type cortexa_target;
 extern struct target_type aarch64_target;
@@ -118,6 +119,7 @@ static struct target_type *target_types[] = {
        &feroceon_target,
        &dragonite_target,
        &xscale_target,
+       &xtensa_chip_target,
        &cortexm_target,
        &cortexa_target,
        &cortexr4_target,
@@ -654,10 +656,10 @@ int target_resume(struct target *target, int current, target_addr_t address,
         * Disable polling during resume() to guarantee the execution of handlers
         * in the correct order.
         */
-       bool save_poll = jtag_poll_get_enabled();
-       jtag_poll_set_enabled(false);
+       bool save_poll_mask = jtag_poll_mask();
        retval = target->type->resume(target, current, address, handle_breakpoints, debug_execution);
-       jtag_poll_set_enabled(save_poll);
+       jtag_poll_unmask(save_poll_mask);
+
        if (retval != ERROR_OK)
                return retval;
 
@@ -685,14 +687,12 @@ static int target_process_reset(struct command_invocation *cmd, enum target_rese
         * more predictable, i.e. dr/irscan & pathmove in events will
         * not have JTAG operations injected into the middle of a sequence.
         */
-       bool save_poll = jtag_poll_get_enabled();
-
-       jtag_poll_set_enabled(false);
+       bool save_poll_mask = jtag_poll_mask();
 
        sprintf(buf, "ocd_process_reset %s", n->name);
        retval = Jim_Eval(cmd->ctx->interp, buf);
 
-       jtag_poll_set_enabled(save_poll);
+       jtag_poll_unmask(save_poll_mask);
 
        if (retval != JIM_OK) {
                Jim_MakeErrorMessage(cmd->ctx->interp);
@@ -2071,7 +2071,7 @@ int target_alloc_working_area_try(struct target *target, uint32_t size, struct w
                struct working_area *new_wa = malloc(sizeof(*new_wa));
                if (new_wa) {
                        new_wa->next = NULL;
-                       new_wa->size = target->working_area_size & ~3UL; /* 4-byte align */
+                       new_wa->size = ALIGN_DOWN(target->working_area_size, 4); /* 4-byte align */
                        new_wa->address = target->working_area;
                        new_wa->backup = NULL;
                        new_wa->user = NULL;
@@ -2082,8 +2082,7 @@ int target_alloc_working_area_try(struct target *target, uint32_t size, struct w
        }
 
        /* only allocate multiples of 4 byte */
-       if (size % 4)
-               size = (size + 3) & (~3UL);
+       size = ALIGN_UP(size, 4);
 
        struct working_area *c = target->working_areas;
 
@@ -2237,7 +2236,7 @@ uint32_t target_get_working_area_avail(struct target *target)
        uint32_t max_size = 0;
 
        if (!c)
-               return target->working_area_size;
+               return ALIGN_DOWN(target->working_area_size, 4);
 
        while (c) {
                if (c->free && max_size < c->size)