Merge pull request #831 from fwsGonzo/dev

Remove old unused memdisk stuff in makefiles

Author: fwsGonzo

src/Makefile

@@ -240,12 +240,6 @@ apic_boot.o: hw/apic_boot.asm
 
 multiboot: boot/multiboot.o
 
-# Disk image as a section
-###################################################
-memdisk: memdisk.asm
-	@echo "\n>> Assembling memdisk"
-	nasm -f elf -o memdisk.o $<
-
 # Etags
 ###################################################
 etags:
@@ -261,6 +255,6 @@ clean_tests:
 clean: clean_tests
 	$(RM) $(OS_OBJECTS) $(CXXABI_OBJ) $(OS_DEPS) $(DRIVERS) $(DRIVERS_DEPS) $(PLATFORMS) $(PLATFORMS_DEPS)
 	$(RM) os.a libc++abi.a
-	$(RM) bootloader apic_boot apic_boot.o memdisk.o boot/multiboot.o
+	$(RM) bootloader apic_boot apic_boot.o boot/multiboot.o
 
 -include $(OS_DEPS)

src/fs/memdisk.cpp

@@ -22,9 +22,6 @@
 #include <fs/memdisk.hpp>
 #include <statman>
 
-#define likely(x)       __builtin_expect(!!(x), 1)
-#define unlikely(x)     __builtin_expect(!!(x), 0)
-
 extern "C" {
   char _DISK_START_;
   char _DISK_END_;
@@ -47,7 +44,7 @@ namespace fs {
 
     auto sector_loc = image_start_ + blk * block_size();
     // Disallow reading memory past disk image
-    if (unlikely(sector_loc >= image_end_))
+    if (UNLIKELY(sector_loc >= image_end_))
       return buffer_t{};
 
     auto buffer = new uint8_t[block_size()];
@@ -64,7 +61,7 @@ namespace fs {
     auto end_loc = start_loc + cnt * block_size();
 
     // Disallow reading memory past disk image
-    if (unlikely(end_loc >= image_end_))
+    if (UNLIKELY(end_loc >= image_end_))
       return buffer_t{};
 
     auto buffer = new uint8_t[cnt * block_size()];

src/memdisk.asm

@@ -119,20 +119,12 @@ minimal: CPPOPTS += -ffunction-sections -fdata-sections
 minimal: LDOPTS += --gc-sections
 minimal: stripped
 
-# Disk image as a section
-###################################################
-memdisk:
-	@echo "\n>> Creating memdisk"
-	python $(INSTALL)/memdisk/memdisk.py --file $(INSTALL)/memdisk/memdisk.asm $(DISK)
-	@echo "\n>> Assembling memdisk"
-	nasm -f elf $(INSTALL)/memdisk/memdisk.asm -o $(MEMDISK)
-
 # Service
 ###################################################
 
 # Link the service with the os
-service: $(OBJS) $(LIBS)
-# build memdisk when IMAGES is set
+service: $(OBJS) $(LIBS) $(DRIVER_OBJS) $(PLATFORM_OBJS)
+# build memdisk only when MEMDISK is set
 ifneq ($(MEMDISK),)
 	@echo "\n>> Creating memdisk"
 	python $(INSTALL)/memdisk/memdisk.py --file $(INSTALL)/memdisk/memdisk.asm $(DISK)
@@ -174,7 +166,7 @@ crt%.o: $(INSTALL)/crt/crt%.s
 # Cleanup
 ###################################################
 clean:
-	$(RM) $(OBJS) $(DEPS) $(SERVICE)
-	$(RM) $(SERVICE).img $(MEMDISK)
+	$(RM) $(OBJS) $(DEPS)
+	$(RM) $(SERVICE) $(SERVICE).img $(MEMDISK)
 
 -include $(DEPS)