projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
READMEのCASL II仕様書へのリンクを修正
[YACASL2.git]
/
src
/
word.c
diff --git
a/src/word.c
b/src/word.c
index
df953c5
..
3ad9a2b
100644
(file)
--- a/
src/word.c
+++ b/
src/word.c
@@
-25,20
+25,11
@@
WORD n2word(const char *str);
*/
WORD h2word(const char *str);
*/
WORD h2word(const char *str);
-/**
- * @brief wordのエラー定義
- */
-static CERR cerr_word[] = {
- { 114, "not integer" },
- { 115, "not hex" },
- { 116, "out of hex range" },
-};
-
WORD n2word(const char *str)
{
assert(isdigit(str[0]) || str[0] == '-');
WORD n2word(const char *str)
{
assert(isdigit(str[0]) || str[0] == '-');
- char *check;
+ char *check
= NULL
;
int n;
/* WORD値に変換 */
n = strtol(str, &check, 10);
int n;
/* WORD値に変換 */
n = strtol(str, &check, 10);
@@
-57,8
+48,8
@@
WORD h2word(const char *str)
{
assert(str[0] == '#');
{
assert(str[0] == '#');
- WORD w = 0
x0
;
- char *check;
+ WORD w = 0;
+ char *check
= NULL
;
str++;
if(*str == '-' || strlen(str) > 4) {
setcerr(116, str-1); /* out of hex range */
str++;
if(*str == '-' || strlen(str) > 4) {
setcerr(116, str-1); /* out of hex range */
@@
-73,6
+64,15
@@
WORD h2word(const char *str)
return w;
}
return w;
}
+/**
+ * @brief wordのエラー定義
+ */
+static CERR cerr_word[] = {
+ { 114, "not integer" },
+ { 115, "not hex" },
+ { 116, "out of hex range" },
+};
+
/* word.hで定義された関数群 */
void addcerrlist_word()
{
/* word.hで定義された関数群 */
void addcerrlist_word()
{
@@
-102,21
+102,19
@@
WORD nh2word(const char *str)
char *word2n(WORD word)
{
enum {
char *word2n(WORD word)
{
enum {
- MAXLEN = 5, /* WORD値を10進数で表したときの最大
桁
数 */
+ MAXLEN = 5, /* WORD値を10進数で表したときの最大
けた
数 */
};
};
- char *n = malloc_chk(MAXLEN + 1, "word2n.n"), tmp;
- int i = 0, j;
+ char *s = malloc_chk(MAXLEN + 1, "word2n.n");
+ char *t = NULL;
+ int d = 0; /* けた数 */
do{
do{
-
n[i
++] = word % 10 + '0';
+
s[d
++] = word % 10 + '0';
} while((word /= 10) > 0);
} while((word /= 10) > 0);
- for(j = 0; j < i; j++) {
- tmp = n[j];
- n[j] = n[(i-1)-j];
- n[(i-1)-j] = tmp;
- }
- n[j] = '\0';
- return n;
+ s[d] = '\0';
+ t = strrev(s);
+ FREE(s);
+ return t;
}
char *word2bit(const WORD word)
}
char *word2bit(const WORD word)
@@
-125,9
+123,10
@@
char *word2bit(const WORD word)
MAXLEN = 16, /* WORD値を2進数で表したときの最大桁数 */
};
WORD mask = 0x8000;
MAXLEN = 16, /* WORD値を2進数で表したときの最大桁数 */
};
WORD mask = 0x8000;
- char *bit =
malloc_chk(MAXLEN + 1, "word2bit.bit")
;
+ char *bit =
NULL
;
int i = 0;
int i = 0;
+ bit = malloc_chk(MAXLEN + 1, "word2bit.bit");
do {
bit[i++] = (word & mask) ? '1' : '0';
} while((mask >>= 1) > 0);
do {
bit[i++] = (word & mask) ? '1' : '0';
} while((mask >>= 1) > 0);
@@
-137,10
+136,10
@@
char *word2bit(const WORD word)
void print_dumpword(WORD word, bool logicalmode)
{
void print_dumpword(WORD word, bool logicalmode)
{
- c
onst c
har *bit = word2bit(word);
+ char *bit = word2bit(word);
if(logicalmode == true) {
if(logicalmode == true) {
- fprintf(stdout, "%6
d
", word);
+ fprintf(stdout, "%6
u
", word);
} else {
fprintf(stdout, "%6d", (signed short)word);
}
} else {
fprintf(stdout, "%6d", (signed short)word);
}
@@
-153,4
+152,5
@@
void print_dumpword(WORD word, bool logicalmode)
} else if(word == '\t') {
fprintf(stdout, " = \'\\t\'");
}
} else if(word == '\t') {
fprintf(stdout, " = \'\\t\'");
}
+ FREE(bit);
}
}