Browse Source

arm11: do not use dynamic arrays

Allocate working memory dynamically, caught by checkstack.pl

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
tags/v0.4.0-rc1
Øyvind Harboe 12 years ago
parent
commit
5985dee35d
2 changed files with 8 additions and 4 deletions
  1. +2
    -1
      TODO
  2. +6
    -3
      src/target/arm11_dbgtap.c

+ 2
- 1
TODO View File

@@ -309,7 +309,8 @@ fairly easy to complete:

- use dynamic allocations for working memory. Scan & fix code
for excessive stack allocations. take linux/scripts/checkstack.pl and
see what the worst offenders are. Example, on amd64:
see what the worst offenders are. Dynamic stack allocations are found
at the bottom of the list below. Example, on amd64:

$ objdump -d | checkstack.pl | head -10
0x004311e3 image_open [openocd]: 13464


+ 6
- 3
src/target/arm11_dbgtap.c View File

@@ -880,10 +880,11 @@ int arm11_sc7_run(struct arm11_common * arm11, struct arm11_sc7_action * actions
*/
void arm11_sc7_clear_vbw(struct arm11_common * arm11)
{
struct arm11_sc7_action clear_bw[arm11->brp + arm11->wrp + 1];
size_t clear_bw_size = arm11->brp + arm11->wrp + 1;
struct arm11_sc7_action *clear_bw = malloc(sizeof(struct arm11_sc7_action) * clear_bw_size);
struct arm11_sc7_action * pos = clear_bw;

for (size_t i = 0; i < ARRAY_SIZE(clear_bw); i++)
for (size_t i = 0; i < clear_bw_size; i++)
{
clear_bw[i].write = true;
clear_bw[i].value = 0;
@@ -899,7 +900,9 @@ void arm11_sc7_clear_vbw(struct arm11_common * arm11)

(pos++)->address = ARM11_SC7_VCR;

arm11_sc7_run(arm11, clear_bw, ARRAY_SIZE(clear_bw));
arm11_sc7_run(arm11, clear_bw, clear_bw_size);

free (clear_bw);
}

/** Write VCR register


Loading…
Cancel
Save