From 3d2af841e601d960d2ed9c7b081cd957fa58e494 Mon Sep 17 00:00:00 2001 From: Astatin Date: Tue, 5 Nov 2024 19:41:14 +0900 Subject: Allow labels defined inside macros to be used as absolute 16b values --- parameters.go | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'parameters.go') diff --git a/parameters.go b/parameters.go index 5e234f5..4c787f3 100644 --- a/parameters.go +++ b/parameters.go @@ -120,7 +120,7 @@ func Raw16(labels *Labels, defs *Definitions, param string) (uint16, error) { return uint16(res), nil } - if strings.HasPrefix(param, "=") && !strings.HasPrefix(param, "=$") { + if strings.HasPrefix(param, "=") { if labels == nil { return 0, nil } @@ -144,23 +144,6 @@ func Raw16(labels *Labels, defs *Definitions, param string) (uint16, error) { return uint16(res), err } -func MacroLabel(labels *Labels, defs *Definitions, param string) (uint16, error) { - if strings.HasPrefix(param, "=$") { - if labels == nil { - return 0, nil - } - - label := strings.ToUpper(strings.TrimPrefix(param, "=")) - labelValue, ok := (*labels)[label] - if !ok { - return 0, fmt.Errorf("Label \"%s\" not found", label) - } - - return uint16(labelValue), nil - } - return 0, fmt.Errorf("Invalid macro label") -} - func Reg16Indirect(_ *Labels, _ *Definitions, param string) (uint16, error) { switch param { case "(BC)": -- cgit v1.2.3-70-g09d2