From f9856341c1f4f40f7612b250cf102b90c8bb59e1 Mon Sep 17 00:00:00 2001 From: Oleg Borodin Date: Wed, 31 Aug 2022 08:50:20 +0200 Subject: [PATCH] semoper.* renamed to atomic.* --- Makefile | 2 +- README.md | 36 ++++++++++++++++-------------------- semoper.S => atomic.S | 4 ++-- semoper.h => atomic.h | 0 main.c | 2 +- semaphore.c | 2 +- 6 files changed, 21 insertions(+), 25 deletions(-) rename semoper.S => atomic.S (89%) rename semoper.h => atomic.h (100%) diff --git a/Makefile b/Makefile index 05b64cc..45e656c 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ OBJS+= main.o OBJS+= syscall.o OBJS+= usartu.o OBJS+= scheduler.o -OBJS+= semoper.o +OBJS+= atomic.o OBJS+= semaphore.o main.elf: $(OBJS) diff --git a/README.md b/README.md index c9ef718..38c1082 100644 --- a/README.md +++ b/README.md @@ -46,24 +46,20 @@ NanoOS: "Make less makes no sense" =) #### Ouput ``` -task 1 6932 -task 2 7157 -task 3 7390 -task 4 7627 2 -task 1 13844 -task 2 14301 -task 3 14762 -task 4 15235 3 -task 1 20760 -task 2 21449 -task 3 22138 -task 4 22843 4 -task 1 27676 -task 2 28597 -task 3 29514 -task 4 30451 5 -task 1 34592 -task 2 35745 -task 3 36890 -task 4 38059 6 +task 2 1 +task 3 14 +task 4 27 1 +task 1 44 +task 2 6341 +task 3 6362 +task 4 6379 2 +task 1 6400 +task 2 12689 +task 3 12710 +task 4 12727 3 +task 1 12752 +task 2 19037 +task 3 19058 +task 4 19079 4 +task 1 19104 ``` diff --git a/semoper.S b/atomic.S similarity index 89% rename from semoper.S rename to atomic.S index cfe6668..4f72bd6 100644 --- a/semoper.S +++ b/atomic.S @@ -20,10 +20,10 @@ atom_inc32: .type atom_dec32, %function atom_dec32: -1: ldrex r2, [r0] +2: ldrex r2, [r0] sub r2, r2, r1 strex r3, r2, [r0] teq r3, #0 - bne 1b + bne 2b mov r0, r2 bx lr diff --git a/semoper.h b/atomic.h similarity index 100% rename from semoper.h rename to atomic.h diff --git a/main.c b/main.c index 8b54559..3fcffdc 100644 --- a/main.c +++ b/main.c @@ -18,7 +18,7 @@ #include "scheduler.h" #include "usartu.h" -#include "semoper.h" +#include "atomic.h" #include "semaphore.h" diff --git a/semaphore.c b/semaphore.c index f83d9bf..c8edee4 100644 --- a/semaphore.c +++ b/semaphore.c @@ -3,7 +3,7 @@ */ #include "semaphore.h" -#include "semoper.h" +#include "atomic.h" void sem_init(sem_t* sem, int32_t value) { sem->value = value;