Fix warnings in linux

TakefiveInteractive · Nov 16, 2015 · ccae0e4 · ccae0e4
1 parent cd2f0c1
commit ccae0e4
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 2 deletions.
diff --git a/mp3/.svnignore b/mp3/.svnignore
@@ -0,0 +1,70 @@
+.*.swp
+.swp
+.DS_Store
+mp3.img
+Makefile.dep
+bootimg
+gcc.dmg
+gcc-strip.tar.gz
+gcc-strip-nolink.tar.gz
+mp3/student-distrib/cross
+mp3/userland/newlib-2.2.0-1/**/*.cache/
+i686-tedkos-ar
+i686-tedkos-as
+i686-tedkos-cc
+i686-tedkos-gcc
+i686-tedkos-ranlib
+newlib-prefix/
+mp3/userland/build-newlib/
+mp3/softlinks
+
+.vimrc
+
+# If using osx-safe building, this file should be ignored
+tedkos.img
+
+# Ignore CTags files created by Atom
+tags
+.tags*
+
+adventure
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+
+# Svn
+.svn
+
+# Youcompleteme
+.ycm_extra_conf.py
+.ycm_extra_conf.pyc
diff --git a/mp3/student-distrib/x86/real-wrapper.cpp b/mp3/student-distrib/x86/real-wrapper.cpp
@@ -10,7 +10,7 @@ spinlock_t legacyInt_lock = SPINLOCK_UNLOCKED;
 // Allocate 1KB for real_mode stack
 volatile uint16_t real_mode_stack[512] __attribute__((aligned (1024)));
 
-real_context_t cpu0_real_context;
+__attribute__((externally_visible)) real_context_t cpu0_real_context;
 
 void legacyInt(int16_t interrupt_num, real_context_t& regs)
 {

diff --git a/mp3/student-distrib/x86/real.S b/mp3/student-distrib/x86/real.S
@@ -138,7 +138,7 @@ real_mode_entry:
     movw  4+14, %es
 
     # calls the jump table to call the correct interrupt NUMBER
-    jmp %bp
+    jmp *%bp
 
 start_return_to_protected:
     # ----- From now on: Working on returning to protected mode -----