On Sat, Nov 13, 2010 at 8:59 PM, Andreas Färber andreas.faerber@web.de wrote:
Am 13.11.2010 um 16:04 schrieb Blue Swirl:
Merge kernel/internal.c and kernel/primitives.c into kernel/forth.c. This helps with the build dependencies.
Signed-off-by: Blue Swirl blauwirbel@gmail.com
Generally this looks okay.
kernel/build.xml | 6 +- kernel/forth.c | 947 ++++++++++++++++++++++++++++++++++++++++++++++++++- kernel/internal.c | 806 ------------------------------------------- kernel/primitives.c | 148 -------- 4 files changed, 949 insertions(+), 958 deletions(-) delete mode 100644 kernel/internal.c delete mode 100644 kernel/primitives.c
Since the patch is pretty large I've mainly checked that init_trampoline() is still present, which it is. I also noticed this includes a conversion to QEMU indentation.
Did you investigate leaving the files separate (in build.xml) and dropping some "static" instead?
At first, I only tried to move those functions which are referenced by 'words' table to forth.c, but in the end everything was there.
This is a very critical area from performance standpoint, so I don't think it's OK to make the functions external.