RT7 plugin updated.
branches/chibistudio_trunk/tools/chibios-rt7_debug_support/META-INF/MANIFEST.MF (diff)
branches/chibistudio_trunk/tools/chibios-rt7_debug_support/src/org/chibios/tools/eclipse/debug/utils/KernelObjects.java (diff)| @@ -217,7 +217,7 @@ | ||
| 217 | 217 | n = evaluateExpressionNumber("(uint32_t)((struct ch_thread *)" + current + ")->flags"); |
| 218 | 218 | map.put("flags", Long.toString(n)); |
| 219 | 219 | |
| 220 | - n = evaluateExpressionNumber("(uint32_t)((struct ch_thread *)" + current + ")->prio"); | |
| 220 | + n = evaluateExpressionNumber("(uint32_t)((struct ch_thread *)" + current + ")->hdr.pqueue.prio"); | |
| 221 | 221 | map.put("prio", Long.toString(n)); |
| 222 | 222 | |
| 223 | 223 | try { |
| @@ -315,7 +315,7 @@ | ||
| 315 | 315 | while (true) { |
| 316 | 316 | |
| 317 | 317 | // Fetching next timer in the delta list (next link). |
| 318 | - current = evaluateExpression("(uint32_t)((struct ch_virtual_timer *)" + current + ")->next"); | |
| 318 | + current = evaluateExpression("(uint32_t)((struct ch_virtual_timer *)" + current + ")->dlist.next"); | |
| 319 | 319 | |
| 320 | 320 | // This can happen if the kernel is not initialized yet or if the |
| 321 | 321 | // delta list is corrupted. |
| @@ -325,7 +325,7 @@ | ||
| 325 | 325 | // TODO: integrity check on the pointer value (alignment, range). |
| 326 | 326 | |
| 327 | 327 | // The previous timer in the delta list is fetched as a integrity check. |
| 328 | - String prev = evaluateExpression("(uint32_t)((struct ch_virtual_timer *)" + current + ")->prev"); | |
| 328 | + String prev = evaluateExpression("(uint32_t)((struct ch_virtual_timer *)" + current + ")->dlist.prev"); | |
| 329 | 329 | if (prev.compareTo("0") == 0) |
| 330 | 330 | throw new DebugProxyException("ChibiOS/RT delta list integrity check failed, NULL pointer"); |
| 331 | 331 | if (previous.compareTo(prev) != 0) |
| @@ -340,7 +340,7 @@ | ||
| 340 | 340 | |
| 341 | 341 | // Fetch of the various fields in the virtual_timer_t structure. Some fields |
| 342 | 342 | // are optional so are placed within try-catch. |
| 343 | - long n = evaluateExpressionNumber("(uint32_t)((struct ch_virtual_timer *)" + current + ")->delta"); | |
| 343 | + long n = evaluateExpressionNumber("(uint32_t)((struct ch_virtual_timer *)" + current + ")->dlist.delta"); | |
| 344 | 344 | map.put("delta", Long.toString(n)); |
| 345 | 345 | |
| 346 | 346 | n = evaluateExpressionNumber("(uint32_t)((struct ch_virtual_timer *)" + current + ")->func"); |
| @@ -505,7 +505,7 @@ | ||
| 505 | 505 | LinkedHashMap<String, String> map = new LinkedHashMap<String, String>(16); |
| 506 | 506 | |
| 507 | 507 | try { |
| 508 | - String vt_lasttime = evaluateExpression("(uint32_t)ch.vtlist.delta"); | |
| 508 | + String vt_lasttime = evaluateExpression("(uint32_t)ch.vtlist.dlist.delta"); | |
| 509 | 509 | if (vt_lasttime == null) |
| 510 | 510 | return null; |
| 511 | 511 | map.put("vt_lasttime", vt_lasttime); |
ChibiOS
gdisirio