verbosity:asm

Author: AndreIglesias

assembler/check_cor.sh

@@ -0,0 +1,13 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    check_cor.sh                                       :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: ciglesia <ciglesia@student.42.fr>          +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2020/09/16 12:01:33 by ciglesia          #+#    #+#              #
+#    Updated: 2020/09/16 12:01:42 by ciglesia         ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+hexdump -vC $1

assembler/include/asm.h

@@ -6,7 +6,7 @@
 /*   By: ciglesia <ciglesia@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/09/05 22:18:22 by ciglesia          #+#    #+#             */
-/*   Updated: 2020/09/15 21:14:35 by ciglesia         ###   ########.fr       */
+/*   Updated: 2020/09/16 12:27:10 by ciglesia         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,9 +19,8 @@
 typedef struct		s_instr
 {
 	t_uchar			opcode;
-	int				nargs;//
-	t_arg_type		args[3];//
-	int				acb;
+	t_uchar			nargs;
+	t_uchar			acb;
 	int				reg;
 	char			*dir;
 	char			*ind;
@@ -47,7 +46,7 @@ typedef struct		s_file
 	t_code			*code_tab;
 }					t_file;
 
-int					translate(t_file *file);
+int					translate(t_file *file, int verbosity);
 
 void				file_init(t_file *file);
 t_code				*new_label(void);

assembler/src/asm_main.c

@@ -6,7 +6,7 @@
 /*   By: ciglesia <ciglesia@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/09/05 22:21:40 by ciglesia          #+#    #+#             */
-/*   Updated: 2020/09/15 19:45:14 by ciglesia         ###   ########.fr       */
+/*   Updated: 2020/09/16 12:29:15 by ciglesia         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,17 +16,17 @@ int		main(int ac, char **av)
 {
 	t_file	file;
 
-	if (ac != 2)
+	if (ac != 2 && ac != 3)
 		return (ft_puterr(ERROR""RED": assembler needs exactly one file!"E0M,
 						EXIT_FAILURE));
-	else
+	else if (ac == 2 || (ac == 3 && ft_strcmp(av[1], "-v") == 0))
 	{
 		file_init(&file);
-		if (valid_input(av[1], &file) == EXIT_FAILURE)
+		if (valid_input((ac == 2) ? av[1] : av[2], &file) == EXIT_FAILURE)
 			return (EXIT_FAILURE);
 		if (verify_code(&file, NULL, 0, 0) == EXIT_FAILURE)
 			return (EXIT_FAILURE);
-		translate(&file);
+		translate(&file, (ac == 3) ? ft_strcmp(av[1], "-v") == 0 : 0);
 		//free table, lists, char*
 	}
 	return (EXIT_SUCCESS);

assembler/src/synthesis/translation.c

@@ -6,7 +6,7 @@
 /*   By: ciglesia <ciglesia@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/09/15 19:12:29 by ciglesia          #+#    #+#             */
-/*   Updated: 2020/09/15 21:24:56 by ciglesia         ###   ########.fr       */
+/*   Updated: 2020/09/16 12:29:44 by ciglesia         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -22,16 +22,19 @@ void	print_instr(t_instruction *instr)
 	}
 }
 
-int		translate(t_file *file)
+int		translate(t_file *file, int verbosity)
 {
 	t_code	*table;
 
 	table = file->code_tab;
 	while (table)
 	{
-		ft_printf(BLUE"%s:\n"E0M, table->label);
-		print_instr(table->instr);
-		//print intrinsic instructions (table->instr)
+		if (verbosity)
+		{
+			ft_printf(BLUE"%s:\n"E0M, table->label);
+			print_instr(table->instr);
+			//print intrinsic instructions (table->instr)
+		}
 		table = table->next;
 	}
 	return (0);