#include "array_t.h"
#define NDEBUG
#else
-#include "array.h"
+#include "array_t.h"
#endif
#include "entity_t.h"
return S_OK;
} /* format_entity */
+/**
+ * format an ir_mode
+ */
+static HRESULT format_mode(DEBUGHELPER *pHelper, const void *addr, char *pResult, size_t max)
+{
+ ir_mode mode;
+
+ if (copy_from_debuggee(addr, pHelper, &mode, sizeof(mode)) != S_OK)
+ return E_FAIL;
+ if (format_ident(pHelper, mode.name, pResult, max) != S_OK)
+ return E_FAIL;
+ return S_OK;
+} /* format_mode */
+
/**
* format a type
*/
_tcsncat(pResult, " ", max);
}
- if (format_ident(pHelper, tp.name, name, sizeof(name)) != S_OK)
- return E_FAIL;
+ name[0] = '\0';
+ if (tp.name) {
+ if (format_ident(pHelper, tp.name, name, sizeof(name)) != S_OK)
+ return E_FAIL;
+ } else {
+ if (format_mode(pHelper, tp.mode, name, sizeof(name)) != S_OK)
+ return E_FAIL;
+ }
_tcsncat(pResult, name, max);
switch (nBase) {
return S_OK;
} /* format_op */
-/**
- * format an ir_mode
- */
-static HRESULT format_mode(DEBUGHELPER *pHelper, const void *addr, char *pResult, size_t max)
-{
- ir_mode mode;
-
- if (copy_from_debuggee(addr, pHelper, &mode, sizeof(mode)) != S_OK)
- return E_FAIL;
- if (format_ident(pHelper, mode.name, pResult, max) != S_OK)
- return E_FAIL;
- return S_OK;
-} /* format_mode */
-
/** get a temporary string */
#define get_string(str) \
do { \
/* show show node attributes */
switch (op.code) {
case iro_Const:
- if (format_tarval(pHelper, nBase, n.attr.con.tv, name, sizeof(name)) != S_OK) {
+ if (format_tarval(pHelper, nBase, n.attr.con.tarval, name, sizeof(name)) != S_OK) {
_tcsncat(pResult, "<???>", max);
}
else {
return E_FAIL;
_tcsncat(pResult, name, max);
break;
- case symconst_addr_name:
- _tcsncat(pResult, "NAME:", max);
- if (format_ident(pHelper, n.attr.symc.sym.ident_p, name, sizeof(name)) != S_OK)
- return E_FAIL;
- _tcsncat(pResult, name, max);
- break;
case symconst_addr_ent:
_tcsncat(pResult, "ENT:", max);
if (format_entity(pHelper, nBase, n.attr.symc.sym.entity_p, name, sizeof(name), 0) != S_OK)
* Find the longest chain of a pset
*/
static HRESULT find_longest_pset_chain(DEBUGHELPER *pHelper, pset *set,
- int *chains, int *lenght, size_t *size) {
+ int *chains, int *lenght, size_t *size)
+{
unsigned i, j;
pset_Segment *seg, *curr;
pset_Element elem;
* Find the longest chain of a set
*/
static HRESULT find_longest_set_chain(DEBUGHELPER *pHelper, set *set,
- int *chains, int *lenght, size_t *size) {
+ int *chains, int *lenght, size_t *size)
+{
unsigned i, j;
set_Segment *seg, *curr;
set_Element elem;
/** show the first 2 units */
static HRESULT fill_bits(DEBUGHELPER *pHelper, bitset_t *bs, char *pResult)
{
- bitset_pos_t i, units = bs->units;
+ unsigned i, units = bs->size;
int l = 0, o = 0, breaked = 0;
unsigned j;
for (i = 0; i < units; ++i) {
- bitset_unit_t data;
+ unsigned data;
- if (copy_from_debuggee((void *)(BS_DATA(bs)[i]), pHelper, &data, sizeof(data)) != S_OK)
+ if (copy_from_debuggee((void *)(&bs->data[i]), pHelper, &data, sizeof(data)) != S_OK)
return E_FAIL;
for (j = 0; j < 32; ++j) {
{
bitset_t bs;
char name[256];
- bitset_pos_t l;
+ unsigned l;
if (copy_from_debuggee(address, pHelper, &bs, sizeof(bs)) != S_OK)
return E_FAIL;