From 94867d24b71582657de8b32b81c1901bdb27c490 Mon Sep 17 00:00:00 2001 From: David Given Date: Mon, 17 Jun 2019 22:26:31 +0200 Subject: [PATCH] Ensure that procedure labels are word aligned (required by the EM spec). --- mach/m68020/ncg/mach.h | 1 + plat/linux68k/boot.s | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/mach/m68020/ncg/mach.h b/mach/m68020/ncg/mach.h index 647a04322..3d37243cd 100644 --- a/mach/m68020/ncg/mach.h +++ b/mach/m68020/ncg/mach.h @@ -21,6 +21,7 @@ You must specify the appropriate word size, then REMOVE tables.c #define newilb(x) fprintf(codefile,"%s:\n",x) #define newdlb(x) fprintf(codefile,"%s:\n",x) +#define newplb(x) fprintf(codefile,".align 4\n%s:\n",x) #define dlbdlb(x,y) fprintf(codefile,"%s = %s\n",x,y) #define newlbss(l,x) fprintf(codefile,".comm %s,%ld\n",l,x); diff --git a/plat/linux68k/boot.s b/plat/linux68k/boot.s index 9d91a6cff..906d5fe96 100644 --- a/plat/linux68k/boot.s +++ b/plat/linux68k/boot.s @@ -44,19 +44,6 @@ begtext: jmp (__m_a_i_n) -#if 0 - mov eax, (esp) ! eax = argc - lea ebx, 4(esp) ! ebx = argv - lea ecx, (esp)(eax*4) - add ecx, 12 ! environ - - push ecx ! environ - push ebx ! argc - push eax ! argv - push eax ! dummy, representing the return argument - xor ebp, ebp -#endif - ! This provides an emergency exit routine used by EM. .define EXIT