add jsr_ap and jmp_ap instructions

3 files changed, 76 insertions, 49 deletions

diff --git a/cgcode.c b/cgcode.c
index b151195..04cb1cc 100644
--- a/cgcode.c
+++ b/cgcode.c
@@ -3441,59 +3441,64 @@ static struct basic_block *profile_function_block;
 
 int profile_flag=PROFILE_NORMAL;
 
-void code_jmp (char label_name[])
+static void code_jmp_ap_ (void)
 {
-	if (!strcmp (label_name,"e__system__sAP")){
 #if defined (I486)
-		end_basic_block_with_registers (2,0,e_vector);
-		i_move_id_r (0,REGISTER_A1,REGISTER_A2);
+	end_basic_block_with_registers (2,0,e_vector);
+	i_move_id_r (0,REGISTER_A1,REGISTER_A2);
 # ifdef PROFILE
-		if (profile_function_label!=NULL)
-			i_jmp_id_profile (4-2,REGISTER_A2,0);
-		else
+	if (profile_function_label!=NULL)
+		i_jmp_id_profile (4-2,REGISTER_A2,0);
+	else
 # endif
-		i_jmp_id (4-2,REGISTER_A2,0);
+	i_jmp_id (4-2,REGISTER_A2,0);
 #else
-		INSTRUCTION_GRAPH graph_1,graph_2,graph_3,graph_4,graph_5;
+	INSTRUCTION_GRAPH graph_1,graph_2,graph_3,graph_4,graph_5;
 
-		graph_1=s_get_a (0);
+	graph_1=s_get_a (0);
 
 # if defined (sparc) || defined (G_POWER)
 #  pragma unused (graph_3,graph_4)
-		graph_2=g_load_id (0,graph_1);
-		graph_5=g_load_id (4-2,graph_2);
+	graph_2=g_load_id (0,graph_1);
+	graph_5=g_load_id (4-2,graph_2);
 # else
-		graph_2=g_load_des_id (DESCRIPTOR_OFFSET,graph_1);
-		graph_3=g_g_register (GLOBAL_DATA_REGISTER);
+	graph_2=g_load_des_id (DESCRIPTOR_OFFSET,graph_1);
+	graph_3=g_g_register (GLOBAL_DATA_REGISTER);
 
-		graph_4=g_add (graph_3,graph_2);
+	graph_4=g_add (graph_3,graph_2);
 
 #  if defined (M68000) && !defined (SUN)
-		graph_5=g_load_des_id (2,graph_4);
+	graph_5=g_load_des_id (2,graph_4);
 #  else
-		graph_5=g_load_id (4,graph_4);
+	graph_5=g_load_id (4,graph_4);
 #  endif
 # endif
 
-		s_push_a (graph_5);
+	s_push_a (graph_5);
 
-		end_basic_block_with_registers (3,0,e_vector);
+	end_basic_block_with_registers (3,0,e_vector);
 # if defined (M68000) && !defined (SUN)
-		i_add_r_r (GLOBAL_DATA_REGISTER,REGISTER_A2);
+	i_add_r_r (GLOBAL_DATA_REGISTER,REGISTER_A2);
 # endif
 # ifdef PROFILE
-		if (profile_function_label!=NULL)
-			i_jmp_id_profile (0,REGISTER_A2,2<<4);
-		else
+	if (profile_function_label!=NULL)
+		i_jmp_id_profile (0,REGISTER_A2,2<<4);
+	else
 # endif
-			i_jmp_id (0,REGISTER_A2,2<<4);
+		i_jmp_id (0,REGISTER_A2,2<<4);
 #endif
-		demand_flag=0;
-		
-		reachable=0;
-		
-		begin_new_basic_block();
-	} else {
+	demand_flag=0;
+	
+	reachable=0;
+	
+	begin_new_basic_block();
+}
+
+void code_jmp (char label_name[])
+{
+	if (!strcmp (label_name,"e__system__sAP"))
+		code_jmp_ap_();
+	else {
 		LABEL *label;
 		int a_stack_size,b_stack_size,n_a_and_f_registers;
 		ULONG *vector;
@@ -3576,6 +3581,12 @@ void code_jmp (char label_name[])
 	}
 }
 
+void code_jmp_ap (void)
+{
+	code_d (2,0,e_vector);
+	code_jmp_ap_();
+}
+
 void code_label (char *label_name);
 
 void code_jmp_eval (VOID)
@@ -3853,42 +3864,47 @@ static int too_many_b_stack_parameters_for_registers (int b_stack_size,int n_dat
 }
 #endif
 
-void code_jsr (char label_name[])
+static void code_jsr_ap_ (void)
 {
-	if (!strcmp (label_name,"e__system__sAP")){
-		INSTRUCTION_GRAPH graph_1,graph_2,graph_3,graph_4,graph_5;
+	INSTRUCTION_GRAPH graph_1,graph_2,graph_3,graph_4,graph_5;
 
 #if !defined (I486)
-		graph_1=s_get_a (0);
+	graph_1=s_get_a (0);
 # if defined (sparc) || defined (G_POWER)
 #  pragma unused (graph_3,graph_4)
-		graph_2=g_load_id (0,graph_1);
-		graph_5=g_load_id (4-2,graph_2);
+	graph_2=g_load_id (0,graph_1);
+	graph_5=g_load_id (4-2,graph_2);
 # else
-		graph_2=g_load_des_id (DESCRIPTOR_OFFSET,graph_1);
-		graph_3=g_g_register (GLOBAL_DATA_REGISTER);
-		graph_4=g_add (graph_3,graph_2);
+	graph_2=g_load_des_id (DESCRIPTOR_OFFSET,graph_1);
+	graph_3=g_g_register (GLOBAL_DATA_REGISTER);
+	graph_4=g_add (graph_3,graph_2);
 
 #  if defined (M68000) && !defined (SUN)	
-		graph_5=g_load_des_id (2,graph_4);
+	graph_5=g_load_des_id (2,graph_4);
 #  else
-		graph_5=g_load_id (4,graph_4);
+	graph_5=g_load_id (4,graph_4);
 #  endif
 # endif
-		s_push_a (graph_5);
+	s_push_a (graph_5);
 #endif
 
-		if (demand_flag)
-			offered_after_jsr=1;
-		demand_flag=0;
+	if (demand_flag)
+		offered_after_jsr=1;
+	demand_flag=0;
 
 #if defined (I486)
-		insert_basic_block (APPLY_BLOCK,2,0,e_vector,NULL);
+	insert_basic_block (APPLY_BLOCK,2,0,e_vector,NULL);
 #else
-		insert_basic_block (APPLY_BLOCK,3,0,e_vector,NULL);
+	insert_basic_block (APPLY_BLOCK,3,0,e_vector,NULL);
 #endif
-		init_a_stack (1);
-	} else {
+	init_a_stack (1);
+}
+
+void code_jsr (char label_name[])
+{
+	if (!strcmp (label_name,"e__system__sAP"))
+		code_jsr_ap_();
+	else {
 		LABEL *label;
 		INSTRUCTION_GRAPH graph;
 		int b_stack_size,n_data_parameter_registers;
@@ -3937,6 +3953,13 @@ void code_jsr (char label_name[])
 	}
 }
 
+void code_jsr_ap (void)
+{
+	code_d (2,0,e_vector);
+	code_jsr_ap_();
+	code_o (1,0,e_vector);
+}
+
 #ifdef G_POWER
 void code_jsr_from_c_to_clean (char *label_name)
 {
diff --git a/cgcodep.h b/cgcodep.h
index 55022fb..4929abe 100644
--- a/cgcodep.h
+++ b/cgcodep.h
@@ -129,11 +129,13 @@ void code_ItoC (VOID);
 void code_ItoP (VOID);
 void code_ItoR (VOID);
 void code_jmp (char label_name[]);
+void code_jmp_ap (void);
 void code_jmp_eval (VOID);
 void code_jmp_eval_upd (VOID);
 void code_jmp_false (char label_name[]);
 void code_jmp_true (char label_name[]);
 void code_jsr (char label_name[]);
+void code_jsr_ap (void);
 void code_jsr_eval (int a_offset);
 void code_lnR (VOID);
 void code_log10R (VOID);
diff --git a/cginput.c b/cginput.c
index 4b0685d..dc5558e 100644
--- a/cginput.c
+++ b/cginput.c
@@ -1832,11 +1832,13 @@ static void put_instructions_in_table (void)
 	put_instruction_name ("ItoP",			parse_instruction,			code_ItoP );
 	put_instruction_name ("ItoR",			parse_instruction,			code_ItoR );
 	put_instruction_name ("jmp",			parse_instruction_a,		code_jmp );
+	put_instruction_name ("jmp_ap",			parse_instruction,			code_jmp_ap );
 	put_instruction_name ("jmp_eval",		parse_instruction,			code_jmp_eval );
 	put_instruction_name ("jmp_eval_upd",	parse_instruction,			code_jmp_eval_upd );
 	put_instruction_name ("jmp_false",		parse_instruction_a,		code_jmp_false );
 	put_instruction_name ("jmp_true",		parse_instruction_a,		code_jmp_true );
 	put_instruction_name ("jsr",			parse_instruction_a,		code_jsr );
+	put_instruction_name ("jsr_ap",			parse_instruction,			code_jsr_ap );
 	put_instruction_name ("jsr_eval",		parse_instruction_n,		code_jsr_eval );
 	put_instruction_name ("lnR",			parse_instruction,			code_lnR );
 	put_instruction_name ("log10R",			parse_instruction,			code_log10R );