1
0
Fork 0
mirror of https://github.com/pnx/m16vm synced 2026-06-16 03:44:55 +02:00

as/asm_error.h: variadic functions did not work at all, switch to macro.

This commit is contained in:
Henrik Hautakoski 2019-01-04 21:28:31 +01:00
parent df58899353
commit e319461f83
No known key found for this signature in database
GPG key ID: 839F3A7EAFAEAFAA
3 changed files with 5 additions and 38 deletions

View file

@ -30,7 +30,7 @@ m16vm : vm/vm.o vm/cpu.o vm/mm.o vm/instr_decode.o \
m16as : as/as.o as/parser.o as/lexer.o \
as/codegen.o as/symtab.o \
as/ast.o as/asm_error.o lib/libm16.a
as/ast.o lib/libm16.a
$(LD) $(LDFLAGS) -o $@ $^
lib/libm16.a : lib/vector.o lib/error.o

View file

@ -1,35 +0,0 @@
/* asm_error.c
*
* Copyright (C) 2018-2019 Henrik Hautakoski <henrik.hautakoski@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
#include <stdio.h>
#include <stdarg.h>
#include "error.h"
#include "asm_error.h"
void asm_warn(int lineno, const char *message, ...) {
fprintf(stderr, "Line %i: ", lineno);
warn(message);
}
int asm_error(int lineno, const char *message, ...) {
fprintf(stderr, "Line %i: ", lineno);
return error(message);
}

View file

@ -22,8 +22,10 @@
#include <error.h>
void asm_warn(int lineno, const char *message, ...);
#define asm_warn(lineno, msg, ...) \
warn("Line: %i " msg, lineno, ##__VA_ARGS__)
int asm_error(int lineno, const char *message, ...);
#define asm_error(lineno, msg, ...) \
error("Line: %i " msg, lineno, ##__VA_ARGS__)
#endif /* ASM_ERROR_H */