projects
/
YACASL2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6bb1b81
)
ラベルに関する無駄な動作を削除、整理
author
j8takagi
<j8takagi@nifty.com>
Sat, 13 Mar 2010 16:17:34 +0000
(
01:17
+0900)
committer
j8takagi
<j8takagi@nifty.com>
Sat, 13 Mar 2010 16:17:34 +0000
(
01:17
+0900)
src/label.c
patch
|
blob
|
history
diff --git
a/src/label.c
b/src/label.c
index
8d3aa4b
..
790a29a
100644
(file)
--- a/
src/label.c
+++ b/
src/label.c
@@
-24,6
+24,7
@@
unsigned labelhash(const char *prog, const char *label)
/* ラベル表からアドレスを検索する */
WORD getlabel(const char *prog, const char *label)
{
/* ラベル表からアドレスを検索する */
WORD getlabel(const char *prog, const char *label)
{
+ assert(label != NULL);
LABELTAB *np;
for(np = labels[labelhash(prog, label)]; np != NULL; np = np->next) {
if((prog == NULL || (np->prog != NULL && strcmp(prog, np->prog) == 0)) &&
LABELTAB *np;
for(np = labels[labelhash(prog, label)]; np != NULL; np = np->next) {
if((prog == NULL || (np->prog != NULL && strcmp(prog, np->prog) == 0)) &&
@@
-35,40
+36,38
@@
WORD getlabel(const char *prog, const char *label)
return 0xFFFF;
}
return 0xFFFF;
}
-/* ã
\83
©ã
\83
\99
ã
\83
«ã
\82
\92
表に追加する */
+/* ã
\83
\97
ã
\83
ã
\82
°ã
\83
©ã
\83
å
\90
\8d
ã
\80
\81
ã
\83
©ã
\83
\99
ã
\83
«ã
\80
\81
ã
\82
¢ã
\83
\89
ã
\83
‹
\82
¹ã
\82
\92
ã
\83
©ã
\83
\99
ã
\83
«
表に追加する */
bool addlabel(const char *prog, const char *label, WORD adr)
{
bool addlabel(const char *prog, const char *label, WORD adr)
{
+ assert(label != NULL);
LABELTAB *np;
unsigned hashval;
LABELTAB *np;
unsigned hashval;
- char *keys[2];
- int i = 0;
+ /* 登録されたラベルを検索。すでに登録されている場合はエラー発生 */
if(getlabel(prog, label) != 0xFFFF) {
setcerr(101, label); /* label already defined */
return false;
}
if(getlabel(prog, label) != 0xFFFF) {
setcerr(101, label); /* label already defined */
return false;
}
- np = malloc(sizeof(*np));
- if(
np
== NULL || (np->label = strdup(label)) == NULL ||
+ /* プログラム名、ラベル、アドレスを設定。メモリーを確保できない場合はエラー発生 */
+ if(
(np = malloc(sizeof(LABELTAB)))
== NULL || (np->label = strdup(label)) == NULL ||
(prog != NULL && (np->prog = strdup(prog)) == NULL))
{
setcerr(102, NULL); /* label table is full */
return false;
}
(prog != NULL && (np->prog = strdup(prog)) == NULL))
{
setcerr(102, NULL); /* label table is full */
return false;
}
- if(prog != NULL) {
- keys[i++] = strdup(prog);
- }
+ np->adr = adr;
+ /* ラベル数の設定 */
labelcnt++;
labelcnt++;
- keys[i] = strdup(label);
+ /* ハッシュ表の設定 */
hashval = labelhash(prog, label);
np->next = labels[hashval];
labels[hashval] = np;
hashval = labelhash(prog, label);
np->next = labels[hashval];
labels[hashval] = np;
- np->adr = adr;
return true;
}
int compare_adr(const void *a, const void *b)
{
return true;
}
int compare_adr(const void *a, const void *b)
{
- return (**(
const LABELARRAY **)a).adr - (**(const
LABELARRAY **)b).adr;
+ return (**(
LABELARRAY **)a).adr - (**(
LABELARRAY **)b).adr;
}
/* ラベル表を表示する */
}
/* ラベル表を表示する */
@@
-80,11
+79,11
@@
void printlabel()
for(i = 0; i < LABELTABSIZE; i++) {
for(np = labels[i]; np != NULL; np = np->next) {
for(i = 0; i < LABELTABSIZE; i++) {
for(np = labels[i]; np != NULL; np = np->next) {
- ar[asize] = malloc(sizeof(LABELARRAY *));
+ assert(np->label != NULL);
+ ar[asize] = malloc(sizeof(LABELARRAY));
ar[asize]->prog = (np->prog == NULL ? NULL : strdup(np->prog));
ar[asize]->label = strdup(np->label);
ar[asize]->prog = (np->prog == NULL ? NULL : strdup(np->prog));
ar[asize]->label = strdup(np->label);
- ar[asize]->adr = np->adr;
- asize++;
+ ar[asize++]->adr = np->adr;
}
}
qsort(ar, asize, sizeof(*ar), compare_adr);
}
}
qsort(ar, asize, sizeof(*ar), compare_adr);
@@
-104,7
+103,9
@@
void freelabel()
for(i = 0; i < LABELTABSIZE; i++) {
for(np = labels[i]; np != NULL; np = nq) {
nq = np->next;
for(i = 0; i < LABELTABSIZE; i++) {
for(np = labels[i]; np != NULL; np = nq) {
nq = np->next;
- free(np->prog);
+ if(np->prog != NULL) {
+ free(np->prog);
+ }
free(np->label);
free(np);
}
free(np->label);
free(np);
}