projects
/
YACASL2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f34ec66
)
コメントの修正
author
j8takagi
<j8takagi@nifty.com>
Wed, 17 Mar 2010 14:41:08 +0000
(23:41 +0900)
committer
j8takagi
<j8takagi@nifty.com>
Wed, 17 Mar 2010 14:41:08 +0000
(23:41 +0900)
src/assemble.c
patch
|
blob
|
history
src/label.c
patch
|
blob
|
history
diff --git
a/src/assemble.c
b/src/assemble.c
index
dfc4aa2
..
02e655a
100644
(file)
--- a/
src/assemble.c
+++ b/
src/assemble.c
@@
-73,7
+73,7
@@
WORD getadr(const char *prog, const char *str, PASS pass)
WORD adr = 0x0;
if(*str == '=') {
adr = getliteral(str, pass);
WORD adr = 0x0;
if(*str == '=') {
adr = getliteral(str, pass);
- } else if(
(*str == '#') || isdigit(*str) || *str == '-
') {
+ } else if(
isdigit(*str) || *str == '-' || *str == '#
') {
adr = nh2word(str);
} else {
if(pass == SECOND && (adr = getlabel(prog, str)) == 0xFFFF) {
adr = nh2word(str);
} else {
if(pass == SECOND && (adr = getlabel(prog, str)) == 0xFFFF) {
diff --git
a/src/label.c
b/src/label.c
index
790a29a
..
a9e4bc3
100644
(file)
--- a/
src/label.c
+++ b/
src/label.c
@@
-1,7
+1,7
@@
#include "casl2.h"
#include "assemble.h"
#include "casl2.h"
#include "assemble.h"
-int labelcnt = 0;
/* ラベル数 */
+int labelcnt = 0; /* ラベル数 */
LABELTAB *labels[LABELTABSIZE]; /* ラベル表 */
/* プログラム名とラベルに対応するハッシュ値を返す */
LABELTAB *labels[LABELTABSIZE]; /* ラベル表 */
/* プログラム名とラベルに対応するハッシュ値を返す */
@@
-48,7
+48,7
@@
bool addlabel(const char *prog, const char *label, WORD adr)
setcerr(101, label); /* label already defined */
return false;
}
setcerr(101, label); /* label already defined */
return false;
}
- /* ã
\83
\97
ã
\83
ã
\82
°ã
\83
©ã
\83
å
\90
\8d
ã
\80
\81
ã
\83
©ã
\83
\99
ã
\83
«ã
\80
\81
ã
\82
¢ã
\83
\89
ã
\83
‹
\82
¹ã
\82
\92
è¨å®
\9a
ã
\80
\82
ã
\83
¡ã
\83
¢ã
\83
ªã
\83
¼ã
\82
\92
確ä¿
\9d
ã
\81
§ã
\81
\8d
ã
\81
ªã
\81
\84
å ´å
\90
\88
ã
\81
¯ã
\82
¨ã
\83
©ã
\83
¼ç
\99
ºç
\94
\9f
*/
+ /* プログラム名、ラベル、アドレスを設定。メモリを確保できない場合はエラー発生 */
if((np = malloc(sizeof(LABELTAB))) == NULL || (np->label = strdup(label)) == NULL ||
(prog != NULL && (np->prog = strdup(prog)) == NULL))
{
if((np = malloc(sizeof(LABELTAB))) == NULL || (np->label = strdup(label)) == NULL ||
(prog != NULL && (np->prog = strdup(prog)) == NULL))
{