TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-18 09:04:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Start implementation of sysinfo

Browse Source
This commit is contained in:
Baptiste Wicht 2013-11-24 20:37:06 +01:00
parent 103f6eb4cf
commit 0eb9c743b5
1 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
kernel/src/shell.cpp
View File

@ -44,13 +44,14 @@ void ls_command(const vector<string>& params);
void cd_command(const vector<string>& params); void cd_command(const vector<string>& params);
void pwd_command(const vector<string>& params); void pwd_command(const vector<string>& params);
void free_command(const vector<string>& params); void free_command(const vector<string>& params);
void sysinfo_command(const vector<string>& params);
struct command_definition { struct command_definition {
const char* name; const char* name;
void (*function)(const vector<string>&); void (*function)(const vector<string>&);
}; };
command_definition commands[17] = { command_definition commands[18] = {
{"reboot", reboot_command}, {"reboot", reboot_command},
{"help", help_command}, {"help", help_command},
{"uptime", uptime_command}, {"uptime", uptime_command},
@ -68,6 +69,7 @@ command_definition commands[17] = {
{"free", free_command}, {"free", free_command},
{"cd", cd_command}, {"cd", cd_command},
{"pwd", pwd_command}, {"pwd", pwd_command},
{"sysinfo", sysinfo_command},
}; };
uint64_t current_input_length = 0; uint64_t current_input_length = 0;
@ -472,10 +474,10 @@ void free_command(const vector<string>&){
void pwd_command(const vector<string>&){ void pwd_command(const vector<string>&){
auto cd = disks::current_directory(); auto cd = disks::current_directory();
if(!cd){ if(cd.empty()){
k_print_line("/"); k_print_line("/");
} else { } else {
k_printf("/%s\n", cd); k_printf("/%s\n", cd.c_str());
} }
} }
@ -487,6 +489,41 @@ void cd_command(const vector<string>& params){
} }
} }
void native_cpuid(uint32_t* eax, uint32_t* ebx, uint32_t* ecx, uint32_t* edx){
/* ecx is often an input as well as an output. */
asm volatile("cpuid"
: "=a" (*eax),
"=b" (*ebx),
"=c" (*ecx),
"=d" (*edx)
: "0" (*eax), "2" (*ecx));
}
void sysinfo_command(const vector<string>&){
uint32_t eax, ebx, ecx, edx;
eax = 1;
native_cpuid(&eax, &ebx, &ecx, &edx);
k_printf("Stepping: %d\n", eax & 0xF);
k_printf("Model: %d\n", (eax >> 4) & 0xF);
k_printf("Family: %d\n", (eax >> 8) & 0xF);
k_printf("Processor Type: %d\n", (eax >> 12) & 0x3);
k_printf("Extended Model: %d\n", (eax >> 16) & 0xF);
k_printf("Extended Family: %d\n", (eax >> 20) & 0xFF);
eax = 0;
native_cpuid(&eax, &ebx, &ecx, &edx);
char vendor_id[13];
*(reinterpret_cast<uint32_t*>(vendor_id)+0) = ebx;
*(reinterpret_cast<uint32_t*>(vendor_id)+1) = edx;
*(reinterpret_cast<uint32_t*>(vendor_id)+2) = ecx;
vendor_id[12] = '\0';
k_printf("Vendor ID: %s\n", vendor_id);
}
} //end of anonymous namespace } //end of anonymous namespace
void init_shell(){ void init_shell(){