From 8b8e89dc8a75a2ea1a93977572baa8046d16413b Mon Sep 17 00:00:00 2001
From: PEDRO MARTINS E SA <pmes18@urquell>
Date: Tue, 26 Nov 2019 09:33:29 -0300
Subject: [PATCH] versao definitiva real
---
includes/meu_malloc.h | 6 +++---
src/meu_malloc.s | 12 +++++------
src/teste.c | 48 +++++++++++++++++++++----------------------
3 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/includes/meu_malloc.h b/includes/meu_malloc.h
index 18fba6b..f659770 100644
--- a/includes/meu_malloc.h
+++ b/includes/meu_malloc.h
@@ -11,15 +11,15 @@ void finalizaAlocador();
void aloca_espaco(int tam_alloc);
//Aloca o ponteiro na heap
-void* alocaMem(int tam_alloc);
+void* meuMalloc(int tam_alloc);
//rearranja os elementos dentro da heap liberando espacos desnecessarios
void arruma_heap();
//libera o ponteiro da heap
-void liberaMem(void* bloco);
+void meuFree(void* bloco);
//escreve o estado atual da heap
-void print_mapa();
+void imprimeMapa();
#endif
\ No newline at end of file
diff --git a/src/meu_malloc.s b/src/meu_malloc.s
index 950e382..51b0ac8 100644
--- a/src/meu_malloc.s
+++ b/src/meu_malloc.s
@@ -18,10 +18,10 @@
.globl iniciaAlocador
.globl finalizaAlocador
.globl aloca_espaco
- .globl alocaMem
+ .globl meuMalloc
.globl arruma_heap
- .globl liberaMem
- .globl print_mapa
+ .globl meuFree
+ .globl imprimeMapa
#---------------------------------------------------------------------#
iniciaAlocador:
@@ -88,7 +88,7 @@ aloca_espaco:
ret
#---------------------------------------------------------------------#
-alocaMem:
+meuMalloc:
pushq %rbp
movq %rsp, %rbp
subq $8, %rsp #aloca espaco para endr
@@ -196,7 +196,7 @@ arruma_heap:
ret
#---------------------------------------------------------------------#
-liberaMem:
+meuFree:
pushq %rbp
movq %rsp, %rbp
@@ -208,7 +208,7 @@ liberaMem:
ret
#---------------------------------------------------------------------#
-print_mapa:
+imprimeMapa:
pushq %rbp
movq %rsp, %rbp
subq $16, %rsp #coloca i na pilha
diff --git a/src/teste.c b/src/teste.c
index 65524c7..9e0ce49 100644
--- a/src/teste.c
+++ b/src/teste.c
@@ -5,41 +5,41 @@ int main () {
void *a,*b,*c,*d,*e;
- a = alocaMem(100);
- print_mapa();
+ a = meuMalloc(100);
+ imprimeMapa();
printf("\n");
- b = alocaMem(500);
- print_mapa();
+ b = meuMalloc(500);
+ imprimeMapa();
printf("\n");
- c = alocaMem(200);
- print_mapa();
+ c = meuMalloc(200);
+ imprimeMapa();
printf("\n");
- d = alocaMem(1000);
- print_mapa();
+ d = meuMalloc(1000);
+ imprimeMapa();
printf("\n");
- liberaMem(a);
- print_mapa();
+ meuFree(a);
+ imprimeMapa();
printf("\n");
- e = alocaMem(1000);
- print_mapa();
+ e = meuMalloc(1000);
+ imprimeMapa();
printf("\n");
- liberaMem(d);
- print_mapa();
+ meuFree(d);
+ imprimeMapa();
printf("\n");
- liberaMem(e);
- print_mapa();
+ meuFree(e);
+ imprimeMapa();
printf("\n");
- e = alocaMem(20);
- print_mapa();
- liberaMem(b);
+ e = meuMalloc(20);
+ imprimeMapa();
+ meuFree(b);
printf("\n");
- print_mapa();
- liberaMem(c);
+ imprimeMapa();
+ meuFree(c);
printf("\n");
- print_mapa();
- liberaMem(e);
+ imprimeMapa();
+ meuFree(e);
printf("\n");
- print_mapa();
+ imprimeMapa();
return (0);
}
--
GitLab