diff --git a/includes/meu_malloc.h b/includes/meu_malloc.h index 18fba6b2b648f8cbf5dab1e3873f69733836ff78..f65977038a050a1ff88086aa62802f4fe48642f3 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 950e382000c8d84071ccd45b9a720ba8f0c4c3ed..51b0ac8e30a2a797cd424165ca161ef86701d341 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 65524c7b11669592708a88eec5cf93a52e7f4aa3..9e0ce496cea11f07fe927470435708b932cfa734 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); }