|
@@ -31,6 +31,8 @@
|
|
|
static char *lbsave;
|
|
static char *lbsave;
|
|
|
static int stack_index;
|
|
static int stack_index;
|
|
|
|
|
|
|
|
|
|
+struct klist_node globvars;
|
|
|
|
|
+
|
|
|
static int do_funcall(char *p);
|
|
static int do_funcall(char *p);
|
|
|
static int set_name(char *p, char *name);
|
|
static int set_name(char *p, char *name);
|
|
|
|
|
|
|
@@ -122,8 +124,20 @@ int x86_64_do_asm(char *p, char c) {
|
|
|
name = strndup(p, out);
|
|
name = strndup(p, out);
|
|
|
p += out;
|
|
p += out;
|
|
|
|
|
|
|
|
|
|
+ _skip_spaces(p);
|
|
|
|
|
+
|
|
|
getword(p, &type, &out);
|
|
getword(p, &type, &out);
|
|
|
|
|
|
|
|
|
|
+ if (type == WORDTYPE_KWORD) {
|
|
|
|
|
+ if (out != '=')
|
|
|
|
|
+ exit(generic_error("invalid keyword after name", lbsave, lno));
|
|
|
|
|
+
|
|
|
|
|
+ p++;
|
|
|
|
|
+ _skip_spaces(p);
|
|
|
|
|
+
|
|
|
|
|
+ getword(p, &type, &out);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (type != WORDTYPE_NR)
|
|
if (type != WORDTYPE_NR)
|
|
|
exit(generic_error("'$' requires a number", lbsave, lno));
|
|
exit(generic_error("'$' requires a number", lbsave, lno));
|
|
|
|
|
|
|
@@ -133,9 +147,12 @@ int x86_64_do_asm(char *p, char c) {
|
|
|
|
|
|
|
|
attr = getattrmask(p, vardef_attrtab);
|
|
attr = getattrmask(p, vardef_attrtab);
|
|
|
|
|
|
|
|
- if (attr & 1)
|
|
|
|
|
|
|
+ if (attr & 1) {
|
|
|
/* global variable */
|
|
/* global variable */
|
|
|
|
|
+
|
|
|
printf(global_var, name, name, out);
|
|
printf(global_var, name, name, out);
|
|
|
|
|
+ __push_nr(&globvars, 0, name, attr);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
else {
|
|
else {
|
|
|
/* variables on stack */
|
|
/* variables on stack */
|
|
@@ -186,6 +203,18 @@ static inline struct klist_node *find_name_stack(char *name) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+static inline struct klist_node *find_name_global(char *name) {
|
|
|
|
|
+ struct klist_node *n;
|
|
|
|
|
+
|
|
|
|
|
+ for (n = globvars.next; n != &globvars; n = n->next)
|
|
|
|
|
+ if (!strcmp(n->payload, name))
|
|
|
|
|
+ return n;
|
|
|
|
|
+
|
|
|
|
|
+ return NULL;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
static int set_name(char *p, char *name) {
|
|
static int set_name(char *p, char *name) {
|
|
|
int type, out;
|
|
int type, out;
|
|
|
struct klist_node *n;
|
|
struct klist_node *n;
|
|
@@ -224,6 +253,9 @@ static int set_name(char *p, char *name) {
|
|
|
/* we need a '&' for global variables */
|
|
/* we need a '&' for global variables */
|
|
|
exit(generic_error("name not found (did you forget '&')", lbsave, lno));
|
|
exit(generic_error("name not found (did you forget '&')", lbsave, lno));
|
|
|
|
|
|
|
|
|
|
+ if (!find_name_global(name + 1))
|
|
|
|
|
+ exit(generic_error("name not found", lbsave, lno));
|
|
|
|
|
+
|
|
|
_skip_word(p);
|
|
_skip_word(p);
|
|
|
_skip_spaces(p);
|
|
_skip_spaces(p);
|
|
|
|
|
|
|
@@ -246,6 +278,7 @@ static int set_name(char *p, char *name) {
|
|
|
|
|
|
|
|
|
|
|
|
|
int do_funcall(char *p) {
|
|
int do_funcall(char *p) {
|
|
|
|
|
+ struct klist_node *stknr;
|
|
|
int out, type;
|
|
int out, type;
|
|
|
char *funcname, *arg;
|
|
char *funcname, *arg;
|
|
|
|
|
|
|
@@ -276,15 +309,22 @@ int do_funcall(char *p) {
|
|
|
|
|
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
- case WORDTYPE_NR:
|
|
|
|
|
- printf("number %d\n", out);
|
|
|
|
|
-
|
|
|
|
|
- break;
|
|
|
|
|
-
|
|
|
|
|
case WORDTYPE_NAME:
|
|
case WORDTYPE_NAME:
|
|
|
arg = strndup(p, out);
|
|
arg = strndup(p, out);
|
|
|
|
|
+ stknr = find_name_stack(arg);
|
|
|
|
|
|
|
|
- printf("name: %s\n", arg);
|
|
|
|
|
|
|
+ if (!stknr) {
|
|
|
|
|
+ printf("global variable\n");
|
|
|
|
|
+
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ out = stknr->value;
|
|
|
|
|
+
|
|
|
|
|
+ /* fall through */
|
|
|
|
|
+
|
|
|
|
|
+ case WORDTYPE_NR:
|
|
|
|
|
+ printf("number %d\n", out);
|
|
|
|
|
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
@@ -308,9 +348,12 @@ int do_funcall(char *p) {
|
|
|
|
|
|
|
|
else
|
|
else
|
|
|
_skip_word(p);
|
|
_skip_word(p);
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ free(arg);
|
|
|
|
|
+ arg = NULL;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- free(arg);
|
|
|
|
|
free(funcname);
|
|
free(funcname);
|
|
|
|
|
|
|
|
return 0;
|
|
return 0;
|