6502/acme
1
0
Fork 0
mirror of https://github.com/uffejakobsen/acme.git synced 2024-11-22 18:32:09 +00:00
Code Issues Projects Releases Wiki Activity

still more cleanup

Browse Source 
git-svn-id: https://svn.code.sf.net/p/acme-crossass/code-0/trunk@133 4df02467-bbd4-4a76-a152-e7ce94205b78
This commit is contained in:
marcobaye 2020-05-02 14:58:17 +00:00
parent 54defa1add
commit d1ac849272
4 changed files with 46 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/acme.c
View File

@ -287,6 +287,7 @@ static boolean do_actual_work(void)
report_init(report); // we must init struct before doing passes report_init(report); // we must init struct before doing passes
if (config.process_verbosity > 1) if (config.process_verbosity > 1)
puts("First pass."); puts("First pass.");
pass.complain_about_undefined = FALSE; // disable until error pass needed
pass.number = -1; // pre-init, will be incremented by perform_pass() pass.number = -1; // pre-init, will be incremented by perform_pass()
perform_pass(); // first pass perform_pass(); // first pass
// pretend there has been a previous pass, with one more undefined result // pretend there has been a previous pass, with one more undefined result
@ -317,9 +318,7 @@ static boolean do_actual_work(void)
// so perform additional pass to find and show them. // so perform additional pass to find and show them.
if (config.process_verbosity > 1) if (config.process_verbosity > 1)
puts("Extra pass needed to find error."); puts("Extra pass needed to find error.");
// activate error output pass.complain_about_undefined = TRUE; // activate error output
ALU_optional_notdef_handler = Throw_error;
perform_pass(); // perform pass, but now show "value undefined" perform_pass(); // perform pass, but now show "value undefined"
return FALSE; return FALSE;
} }

99
src/alu.c
View File

@ -234,19 +234,6 @@ static char *value_not_defined(void)
} }
// function pointer for "value undefined" error output. set to NULL to suppress those errors.
void (*ALU_optional_notdef_handler)(const char *) = NULL;
// function to handle "result is undefined" type errors.
// maybe split this into "_result_ is undefined" (in that case, count) and "symbol is undefined" (in that case, call handler)
static void result_is_undefined(void)
{
++pass.undefined_count;
if (ALU_optional_notdef_handler)
ALU_optional_notdef_handler(value_not_defined());
}
// enlarge operator stack // enlarge operator stack
static void enlarge_operator_stack(void) static void enlarge_operator_stack(void)
{ {
@ -1474,8 +1461,18 @@ static void parse_expression(struct expression *expression)
result->flags &= ~NUMBER_FORCES_8; result->flags &= ~NUMBER_FORCES_8;
// if there was nothing to parse, mark as undefined FIXME - change this! make "nothing" its own result type; only numbers may be undefined // if there was nothing to parse, mark as undefined FIXME - change this! make "nothing" its own result type; only numbers may be undefined
// (so ALU_defined_int() can react) // (so ALU_defined_int() can react)
if (expression->is_empty) if (expression->is_empty) {
result->flags &= ~NUMBER_IS_DEFINED; result->flags &= ~NUMBER_IS_DEFINED;
} else {
// not empty. undefined?
if (!(expression->number.flags & NUMBER_IS_DEFINED)) {
// then count (in all passes)
++pass.undefined_count;
// and throw error (in error pass)
if (pass.complain_about_undefined)
Throw_error(value_not_defined());
}
}
// do some checks depending on int/float // do some checks depending on int/float
if (result->flags & NUMBER_IS_FLOAT) { if (result->flags & NUMBER_IS_FLOAT) {
/*float*/ // if undefined, return zero /*float*/ // if undefined, return zero
@ -1520,7 +1517,7 @@ static void parse_expression(struct expression *expression)
// EMPTY: allow // EMPTY: allow
// UNDEFINED: complain _seriously_ // UNDEFINED: complain _seriously_
// FLOAT: convert to int // FLOAT: convert to int
int ALU_optional_defined_int(intval_t *target) // ACCEPT_EMPTY boolean ALU_optional_defined_int(intval_t *target) // ACCEPT_EMPTY
{ {
struct expression expression; struct expression expression;
@ -1531,20 +1528,19 @@ int ALU_optional_defined_int(intval_t *target) // ACCEPT_EMPTY
&& (!(expression.number.flags & NUMBER_IS_DEFINED))) && (!(expression.number.flags & NUMBER_IS_DEFINED)))
Throw_serious_error(value_not_defined()); Throw_serious_error(value_not_defined());
if (expression.is_empty) if (expression.is_empty)
return 0; return FALSE;
// something was given, so store // something was given, so store
if (expression.number.flags & NUMBER_IS_FLOAT) if (expression.number.flags & NUMBER_IS_FLOAT)
*target = expression.number.val.fpval; *target = expression.number.val.fpval;
else else
*target = expression.number.val.intval; *target = expression.number.val.intval;
return 1; return TRUE;
} }
// Store int value and flags (floats are transformed to int) // Store int value and flags (floats are transformed to int)
// For empty expressions, an error is thrown. // For empty expressions, an error is thrown.
// For undefined results, result_is_undefined() is called.
// OPEN_PARENTHESIS: complain // OPEN_PARENTHESIS: complain
// EMPTY: complain // EMPTY: complain
// UNDEFINED: allow // UNDEFINED: allow
@ -1564,14 +1560,11 @@ void ALU_int_result(struct number *intresult) // ACCEPT_UNDEFINED
} }
if (expression.is_empty) if (expression.is_empty)
Throw_error(exception_no_value); Throw_error(exception_no_value);
else if (!(intresult->flags & NUMBER_IS_DEFINED))
result_is_undefined();
} }
// return int value (if undefined, return zero) // return int value (if undefined, return zero)
// For empty expressions, an error is thrown. // For empty expressions, an error is thrown.
// For undefined results, result_is_undefined() is called.
// OPEN_PARENTHESIS: complain // OPEN_PARENTHESIS: complain
// EMPTY: complain // EMPTY: complain
// UNDEFINED: allow // UNDEFINED: allow
@ -1586,8 +1579,6 @@ intval_t ALU_any_int(void) // ACCEPT_UNDEFINED
Throw_error(exception_paren_open); Throw_error(exception_paren_open);
if (expression.is_empty) if (expression.is_empty)
Throw_error(exception_no_value); Throw_error(exception_no_value);
else if (!(expression.number.flags & NUMBER_IS_DEFINED))
result_is_undefined();
if (expression.number.flags & NUMBER_IS_FLOAT) if (expression.number.flags & NUMBER_IS_FLOAT)
return expression.number.val.fpval; return expression.number.val.fpval;
else else
@ -1644,14 +1635,11 @@ void ALU_liberal_int(struct expression *expression) // ACCEPT_UNDEFINED | ACCEPT
} }
if (expression->is_empty) if (expression->is_empty)
Throw_error(exception_no_value); Throw_error(exception_no_value);
else if (!(intresult->flags & NUMBER_IS_DEFINED))
result_is_undefined();
} }
// Store value and flags (result may be either int or float) // Store value and flags (result may be either int or float)
// For empty expressions, an error is thrown. // For empty expressions, an error is thrown.
// If the result's "defined" flag is clear, result_is_undefined() is called.
// OPEN_PARENTHESIS: complain // OPEN_PARENTHESIS: complain
// EMPTY: complain // EMPTY: complain
// UNDEFINED: allow // UNDEFINED: allow
@ -1666,68 +1654,65 @@ void ALU_any_result(struct number *result) // ACCEPT_UNDEFINED | ACCEPT_FLOAT
Throw_error(exception_paren_open); Throw_error(exception_paren_open);
if (expression.is_empty) if (expression.is_empty)
Throw_error(exception_no_value); Throw_error(exception_no_value);
else if (!(result->flags & NUMBER_IS_DEFINED))
result_is_undefined();
} }
// FIXME - find out where pass.needvalue_count must be incremented and do that!
/* TODO /* TODO
// stores int value and flags, allowing for one '(' too many (x-indirect addr). // stores int value and flags, allowing for one '(' too many (x-indirect addr).
void ALU_liberal_int(struct expression *expression) void ALU_liberal_int(struct expression *expression)
mnemo.c mnemo.c
when parsing addressing mode (except after '#' and '[') when parsing addressing mode (except after '#' and '[') needvalue!
// stores int value and flags (floats are transformed to int) // stores int value and flags (floats are transformed to int)
void ALU_int_result(struct number *intresult) void ALU_int_result(struct number *intresult)
mnemo.c mnemo.c
when parsing address arg after '#' when parsing address arg after '#' indirect? needvalue!
when parsing address arg after '[' when parsing address arg after '[' indirect? needvalue!
when parsing address after near branch (needs () check) when parsing address after near branch indirect? needvalue!
when parsing address after far branch (needs () check) when parsing address after far branch indirect? needvalue!
when parsing address after bbrX/bbsX (needs () check) when parsing address after bbrX/bbsX indirect? needvalue!
when parsing address after rmbX/smbX (needs () check) when parsing address after rmbX/smbX indirect? needvalue!
twice when parsing MVN/MVP (needs () check) twice when parsing MVN/MVP indirect? needvalue!
// stores value and flags (result may be either int or float) // stores value and flags (result may be either int or float)
void ALU_any_result(struct number *result) void ALU_any_result(struct number *result)
macro.c macro.c
macro call, when parsing call-by-value arg (FIXME: undefined does not mean needvalue!) macro call, when parsing call-by-value arg don't care
pseudoopcodes.c pseudoopcodes.c
!set (FIXME: undefined does not mean needvalue!) !set don't care
when throwing user-specified errors (FIXME: undefined does not mean needvalue!) when throwing user-specified errors don't care
symbol.c symbol.c
explicit symbol definition (FIXME: undefined does not mean needvalue!) explicit symbol definition don't care
// stores int value and flags (floats are transformed to int) // stores int value and flags (floats are transformed to int)
// if result was undefined, serious error is thrown // if result was undefined, serious error is thrown
void ALU_defined_int(struct number *intresult) void ALU_defined_int(struct number *intresult)
flow.c flow.c
when parsing loop conditions (should be rather bool?) when parsing loop conditions make bool serious
pseudoopcodes.c pseudoopcodes.c
*= (FIXME, allow undefined) *= (FIXME, allow undefined) needvalue!
!initmem !initmem serious
!fill (1st arg) (maybe allow undefined?) !fill (1st arg) (maybe allow undefined?) needvalue!
!skip (maybe allow undefined?) !skip (maybe allow undefined?) needvalue!
!align (1st + 2nd arg) (maybe allow undefined?) !align (1st + 2nd arg) (maybe allow undefined?) needvalue!
!pseudopc (FIXME, allow undefined) !pseudopc (FIXME, allow undefined) needvalue!
!if (should be rather bool?) !if make bool serious
twice in !for twice in !for serious
// stores int value if given. Returns whether stored. Throws error if undefined. // stores int value if given. Returns whether stored. Throws error if undefined.
int ALU_optional_defined_int(intval_t *target) int ALU_optional_defined_int(intval_t *target)
pseudoopcodes.c pseudoopcodes.c
twice for !binary (maybe allow undefined?) twice for !binary (maybe allow undefined?) needvalue!
//!enum //!enum
// returns int value (0 if result was undefined) // returns int value (0 if result was undefined)
intval_t ALU_any_int(void) intval_t ALU_any_int(void)
pseudoopcodes.c pseudoopcodes.c
!xor !xor needvalue!
iterator for !by, !wo, etc. iterator for !by, !wo, etc. needvalue!
byte values in !raw, !tx, etc. byte values in !raw, !tx, etc. needvalue!
!scrxor !scrxor needvalue!
!fill (2nd arg) !fill (2nd arg) needvalue!
!align (3rd arg) !align (3rd arg) needvalue!
*/ */

6
src/alu.h
View File

@ -47,10 +47,6 @@ struct expression {
// create dynamic buffer, operator/function trees and operator/operand stacks // create dynamic buffer, operator/function trees and operator/operand stacks
extern void ALU_init(void); extern void ALU_init(void);
// function pointer for "value undefined" error output.
// set to NULL to suppress those errors,
// set to Throw_error to show them.
extern void (*ALU_optional_notdef_handler)(const char *);
// FIXME - replace all the functions below with a single one using a "flags" arg! // FIXME - replace all the functions below with a single one using a "flags" arg!
@ -66,7 +62,7 @@ extern void (*ALU_optional_notdef_handler)(const char *);
*/ */
// stores int value if given. Returns whether stored. Throws error if undefined. // stores int value if given. Returns whether stored. Throws error if undefined.
extern int ALU_optional_defined_int(intval_t *target); extern boolean ALU_optional_defined_int(intval_t *target);
// returns int value (0 if result was undefined) // returns int value (0 if result was undefined)
extern intval_t ALU_any_int(void); extern intval_t ALU_any_int(void);
// stores int value and flags (floats are transformed to int) // stores int value and flags (floats are transformed to int)

1
src/global.h
View File

@ -82,6 +82,7 @@ struct pass {
int undefined_count; // counts undefined expression results (if this stops decreasing, next pass must list them as errors) int undefined_count; // counts undefined expression results (if this stops decreasing, next pass must list them as errors)
//int needvalue_count; // counts undefined expression results actually needed for output (when this hits zero, we're done) FIXME - use //int needvalue_count; // counts undefined expression results actually needed for output (when this hits zero, we're done) FIXME - use
int error_count; int error_count;
boolean complain_about_undefined; // will be FALSE until error pass is needed
}; };
extern struct pass pass; extern struct pass pass;
#define FIRST_PASS (pass.number == 0) #define FIRST_PASS (pass.number == 0)