CHange release version , and modification to amd64 cpuid

Bone-Project · Jan 17, 2017 · fc546c1 · fc546c1
1 parent 5cbf47a
commit fc546c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/apps/sh/values.c b/apps/sh/values.c
@@ -27,6 +27,6 @@
 
 char* VAR_USER = "root";
 char* VAR_PWD = "/";
-char* VAR_RELEASE = "0.0.1";
+char* VAR_RELEASE = "0.0.2";
 char* VAR_OSNAME = "BoneOS";
 char* VAR_PLATFORM = "x86_32";
diff --git a/arch/amd64/cpu/cpuid.c b/arch/amd64/cpu/cpuid.c
@@ -15,11 +15,11 @@
  **   along with BoneOS.  If not, see <http://www.gnu.org/licenses/>.
  **
  **  @main_author : Amanuel Bogale
- **  
+ **
  **  @contributors:
 
  **     Amanuel Bogale <amanuel2> : start
- **/ 
+ **/
 
 #include <cpu/cpuid.h>
 
@@ -31,16 +31,16 @@
 bool has_cpuid_ins(){
 	int res;
 	__asm__ __volatile__ (".intel_syntax\n\t"
-	                      "pushfd\n\t"
-	                      "pushfd\n\t"
+	                      "pushfq\n\t"
+	                      "pushfq\n\t"
 	                      "xor dword ptr [%%rsp],0x200000\n\t"
-	                      "popfd\n\t"
-	                      "pushfd\n\t"
+	                      "popfq\n\t"
+	                      "pushfq\n\t"
 	                      "pop %%eax\n\t"
 	                      "xor %%eax,[%%rsp]\n\t"
-	                      "popfd\n\t"
+	                      "popfq\n\t"
 	                      "and %%eax,0x200000\n\t"
 	                      ".att_syntax"
 	                      :"=a"(res));
 	return res;
-}
+}
diff --git a/bin/echo/opts/main_echo.c b/bin/echo/opts/main_echo.c
@@ -48,7 +48,6 @@ int main_echo_opt_handler(char *cmd)
       {
           for(size_t i=1; i<num_opts; i++)
           {
-
             for(size_t j=0; opts[i].str[j]; j++)
             {
               if(i==1 && j==0) j++;
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,6 @@ int main_echo_opt_handler(char *cmd) @@
           {
               for(size_t i=1; i<num_opts; i++)
               {
                 for(size_t j=0; opts[i].str[j]; j++)
                 {
                   if(i==1 && j==0) j++;
@@ Expand Down @@