1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
--- dictionary.c.orig 2010-09-12 15:14:52 UTC
+++ dictionary.c
@@ -662,7 +662,7 @@ void ficlDictionarySee(ficlDictionary *d
*trace++ = '>';
else
*trace++ = ' ';
- trace += sprintf(trace, "%3d ", cell - param0);
+ trace += sprintf(trace, "%3ld ", (long)(cell - param0));
if (ficlDictionaryIsAWord(dictionary, word))
{
@@ -676,7 +676,7 @@ void ficlDictionarySee(ficlDictionary *d
break;
case FICL_WORDKIND_INSTRUCTION_WITH_ARGUMENT:
c = *++cell;
- sprintf(trace, "%s (instruction %ld), with argument %ld (%#lx)", ficlDictionaryInstructionNames[(long)word], (long)word, c.i, c.u);
+ sprintf(trace, "%s (instruction %ld), with argument %ld (%#lx)", ficlDictionaryInstructionNames[(long)word], (long)word, (long)c.i, (long unsigned)c.u);
break;
case FICL_WORDKIND_INSTRUCTION_WORD:
sprintf(trace, "%s :: executes %s (instruction word %ld)", word->name, ficlDictionaryInstructionNames[(long)word->code], (long)word->code);
@@ -687,20 +687,20 @@ void ficlDictionarySee(ficlDictionary *d
{
ficlWord *word = (ficlWord *)c.p;
sprintf(trace, "%.*s ( %#lx literal )",
- word->length, word->name, c.u);
+ word->length, word->name, (long unsigned)c.u);
}
else
- sprintf(trace, "literal %ld (%#lx)", c.i, c.u);
+ sprintf(trace, "literal %ld (%#lx)", (long)c.i, (long unsigned)c.u);
break;
case FICL_WORDKIND_2LITERAL:
c = *++cell;
c2 = *++cell;
- sprintf(trace, "2literal %d %d (%#lx %#lx)", c2.i, c.i, c2.u, c.u);
+ sprintf(trace, "2literal %ld %ld (%#lx %#lx)", (long)c2.i, (long)c.i, (long unsigned)c2.u, (long unsigned)c.u);
break;
#if FICL_WANT_FLOAT
case FICL_WORDKIND_FLITERAL:
c = *++cell;
- sprintf(trace, "fliteral %f (%#lx)", c.f, c.u);
+ sprintf(trace, "fliteral %f (%#lx)", (double)c.f, (long unsigned)c.u);
break;
#endif /* FICL_WANT_FLOAT */
case FICL_WORDKIND_STRING_LITERAL:
@@ -719,32 +719,32 @@ void ficlDictionarySee(ficlDictionary *d
break;
case FICL_WORDKIND_BRANCH0:
c = *++cell;
- sprintf(trace, "branch0 %d", cell + c.i - param0);
+ sprintf(trace, "branch0 %ld", (long)(cell + c.i - param0));
break;
case FICL_WORDKIND_BRANCH:
c = *++cell;
- sprintf(trace, "branch %d", cell + c.i - param0);
+ sprintf(trace, "branch %ld", (long)(cell + c.i - param0));
break;
case FICL_WORDKIND_QDO:
c = *++cell;
- sprintf(trace, "?do (leave %d)", (ficlCell *)c.p - param0);
+ sprintf(trace, "?do (leave %ld)", (long)((ficlCell *)c.p - param0));
break;
case FICL_WORDKIND_DO:
c = *++cell;
- sprintf(trace, "do (leave %d)", (ficlCell *)c.p - param0);
+ sprintf(trace, "do (leave %ld)", (long)((ficlCell *)c.p - param0));
break;
case FICL_WORDKIND_LOOP:
c = *++cell;
- sprintf(trace, "loop (branch %d)", cell + c.i - param0);
+ sprintf(trace, "loop (branch %ld)", (long)(cell + c.i - param0));
break;
case FICL_WORDKIND_OF:
c = *++cell;
- sprintf(trace, "of (branch %d)", cell + c.i - param0);
+ sprintf(trace, "of (branch %ld)", (long)(cell + c.i - param0));
break;
case FICL_WORDKIND_PLOOP:
c = *++cell;
- sprintf(trace, "+loop (branch %d)", cell + c.i - param0);
+ sprintf(trace, "+loop (branch %ld)", (long)(cell + c.i - param0));
break;
default:
sprintf(trace, "%.*s", word->length, word->name);
@@ -754,7 +754,7 @@ void ficlDictionarySee(ficlDictionary *d
}
else /* probably not a word - punt and print value */
{
- sprintf(trace, "%ld ( %#lx )", cell->i, cell->u);
+ sprintf(trace, "%ld ( %#lx )", (long)cell->i, (long unsigned)cell->u);
}
ficlCallbackTextOut(callback, buffer);
|
