DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-19 09:06:32 +00:00
Code Issues Releases Wiki Activity

将内核层空间移动到0xffff800000000000

Browse Source
This commit is contained in:
fslongjin
2022-04-09 21:11:07 +08:00
parent 24b351c9ec
commit 05dc7ac73b
14 changed files with 321 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
kernel/common/cpu.c
View File

@ -7,7 +7,7 @@ void cpu_init(void)
// 获取处理器制造商信息
uint tmp_info[4] = {0};
cpu_cpuid(0, 0, &tmp_info[0], &tmp_info[1], &tmp_info[2], &tmp_info[3]);
// 保存CPU支持的最大cpuid指令主功能号
Cpu_cpuid_max_Basic_mop = tmp_info[0];
// 保存制造商名称
@ -37,28 +37,28 @@ void cpu_init(void)
// EAX中包含 Version Informatin Type,Family,Model,and Stepping ID
Cpu_Stepping_ID = tmp_info[0] & 0xf;
Cpu_Model_ID = (tmp_info[0]>>4) & 0xf;
Cpu_Family_ID = (tmp_info[0]>>8) & 0xf;
Cpu_Processor_Type = (tmp_info[0]>>12)& 0x3;
Cpu_Model_ID = (tmp_info[0] >> 4) & 0xf;
Cpu_Family_ID = (tmp_info[0] >> 8) & 0xf;
Cpu_Processor_Type = (tmp_info[0] >> 12) & 0x3;
// 14-15位保留
Cpu_Extended_Model_ID = (tmp_info[0]>>16)&0xf;
Cpu_Extended_Family_ID = (tmp_info[0]>>20)&0xff;
//31-25位保留
kinfo("Family ID=%#03lx\t Extended Family ID=%#03lx\t Processor Type=%#03lx\t",Cpu_Family_ID, Cpu_Extended_Family_ID, Cpu_Processor_Type);
kinfo("Model ID=%#03lx\t Extended Model ID=%#03lx\tStepping ID=%#03lx\t",Cpu_Model_ID, Cpu_Extended_Model_ID,Cpu_Stepping_ID);
Cpu_Extended_Model_ID = (tmp_info[0] >> 16) & 0xf;
Cpu_Extended_Family_ID = (tmp_info[0] >> 20) & 0xff;
// 31-25位保留
kinfo("Family ID=%#03lx\t Extended Family ID=%#03lx\t Processor Type=%#03lx\t", Cpu_Family_ID, Cpu_Extended_Family_ID, Cpu_Processor_Type);
kinfo("Model ID=%#03lx\t Extended Model ID=%#03lx\tStepping ID=%#03lx\t", Cpu_Model_ID, Cpu_Extended_Model_ID, Cpu_Stepping_ID);
// 使用0x80000008主功能号，查询处理器支持的最大可寻址地址线宽度
cpu_cpuid(0x80000008, 0, &tmp_info[0], &tmp_info[1], &tmp_info[2], &tmp_info[3]);
Cpu_max_phys_addrline_size = tmp_info[0]&0xff;
Cpu_max_linear_addrline_size = (tmp_info[0]>>8)&0xff;
Cpu_max_phys_addrline_size = tmp_info[0] & 0xff;
Cpu_max_linear_addrline_size = (tmp_info[0] >> 8) & 0xff;
kinfo("Cpu_max_phys_addrline_size = %d", Cpu_max_phys_addrline_size);
kinfo("Cpu_max_linear_addrline_size = %d", Cpu_max_linear_addrline_size);
cpu_cpuid(0x80000000, 0, &tmp_info[0], &tmp_info[1], &tmp_info[2], &tmp_info[3]);
Cpu_cpuid_max_Extended_mop = tmp_info[0];
kinfo("Max basic mop=%#05lx",Cpu_cpuid_max_Basic_mop);
kinfo("Max extended mop=%#05lx",Cpu_cpuid_max_Extended_mop);
kinfo("Max basic mop=%#05lx", Cpu_cpuid_max_Basic_mop);
kinfo("Max extended mop=%#05lx", Cpu_cpuid_max_Extended_mop);
return;
}

14
kernel/common/printk.c
View File

@ -28,16 +28,19 @@ int printk_init(const int char_size_x, const int char_size_y)
struct multiboot_tag_framebuffer_info_t info;
int reserved;
multiboot2_iter(multiboot2_get_Framebuffer_info, &info, &reserved);
pos.width = info.framebuffer_width;
pos.height = info.framebuffer_height;
pos.char_size_x = char_size_x;
pos.char_size_y = char_size_y;
pos.max_x = calculate_max_charNum(pos.width, char_size_x);
pos.max_y = calculate_max_charNum(pos.height, char_size_y);
VBE_FB_phys_addr = (ul)info.framebuffer_addr;
pos.FB_address = (uint *)0x0000000003000000;
pos.FB_address = (uint *)0xffff800003000000;
pos.FB_length = 1UL * pos.width * pos.height;
// 初始化自旋锁
@ -69,11 +72,11 @@ int printk_init(const int char_size_x, const int char_size_y)
pos.x = 0;
pos.y = 0;
cls();
kdebug("width=%d\theight=%d", pos.width, pos.height);
return 0;
}
@ -532,7 +535,6 @@ static char *write_float_point_num(char *str, double num, int field_width, int p
// 设置填充元素
pad = (flags & PAD_ZERO) ? '0' : ' ';
sign = 0;
if (flags & SIGN && num < 0)
{