diff options
| author | Jim Blandy <jimb@codesourcery.com> | 2000-04-19 23:19:04 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@codesourcery.com> | 2000-04-19 23:19:04 +0000 |
| commit | c3d6b60b406f2e95b99132e46a5436485e37673d (patch) | |
| tree | 2e6cec31a1e2c699298678ea7d0e6add79efb3ad /gdb/i386v-nat.c | |
| parent | 7dea59cbcaf2126fc11a6d44e1779855d288191f (diff) | |
| download | gdb-c3d6b60b406f2e95b99132e46a5436485e37673d.tar.gz | |
For real this time.
* i386v-nat.c (i386_insert_nonaligned_watchpoint): Use a
two-dimensional array, instead of faking it with explicit index
arithmetic.
Diffstat (limited to 'gdb/i386v-nat.c')
| -rw-r--r-- | gdb/i386v-nat.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gdb/i386v-nat.c b/gdb/i386v-nat.c index 0bf702c368c..274d59e4d77 100644 --- a/gdb/i386v-nat.c +++ b/gdb/i386v-nat.c @@ -229,12 +229,12 @@ i386_insert_nonaligned_watchpoint (pid, waddr, addr, len, rw) int size; int rv; - static int size_try_array[16] = + static int size_try_array[4][4] = { - 1, 1, 1, 1, /* trying size one */ - 2, 1, 2, 1, /* trying size two */ - 2, 1, 2, 1, /* trying size three */ - 4, 1, 2, 1 /* trying size four */ + { 1, 1, 1, 1 }, /* trying size one */ + { 2, 1, 2, 1 }, /* trying size two */ + { 2, 1, 2, 1 }, /* trying size three */ + { 4, 1, 2, 1 } /* trying size four */ }; rv = 0; @@ -242,8 +242,7 @@ i386_insert_nonaligned_watchpoint (pid, waddr, addr, len, rw) { align = addr % 4; /* Four is the maximum length for 386. */ - size = (len > 4) ? 3 : len - 1; - size = size_try_array[size * 4 + align]; + size = size_try_array[len > 4 ? 3 : len - 1][align]; rv = i386_insert_aligned_watchpoint (pid, waddr, addr, size, rw); if (rv) |