tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2025-06-07 00:04:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CAsmIns -> CAsmInst

Browse Source
This commit is contained in:
v0x3l 2020-03-03 23:38:19 -06:00
parent c3c6a8c6ee
commit 470a4d5879
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Zenith-latest-2020-03-03-21_30_17.iso → Zenith-latest-2020-03-03-23_38_04.iso
View File

Binary file not shown.

2
src/Apps/Budget/Budget.CC
View File

@ -35,7 +35,7 @@ class CBgtEntry
#define BT_ANNUAL 5
DefineListLoad("ST_BGT_TEMPLATE_TYPES",
"Null\0Interval\0Monthly\0Bimonthly\0Semiannual\0Annual\0");
"Null\0Interval\0Monthly\0Bimonthly\0Semiannual\0Annual");
class CBgtTemplate
{

6
src/Compiler/Asm.CC
View File

@ -435,7 +435,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcount)
CAsmArg *tmpa1,*tmpa2;
Bool ModrM_complete,U8_avail=FALSE,found_second_possible=FALSE;
CInst *tmpins;
CAsmIns cur,best;
CAsmInst cur,best;
best.U8_count=255;
if (argcount>0)
@ -452,7 +452,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcount)
U8_avail=TRUE;
if (Bt(&arg1mask,tmpins->arg1) && Bt(&arg2mask,tmpins->arg2) &&
(!(tmpins->flags&IEF_NOT_IN_64_BIT) || aotc->seg_size!=64)) {
MemSet(&cur,0,sizeof(CAsmIns));
MemSet(&cur,0,sizeof(CAsmInst));
cur.tmpins=tmpins;
ModrM_complete=FALSE;
cur.is_default=ToBool(tmpins->flags & IEF_DEFAULT);
@ -798,7 +798,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcount)
if (cur.U8_count<best.U8_count &&
!(tmpins->flags & IEF_DONT_SWITCH_MODES &&
(cur.has_addr_prefix || cur.has_operand_prefix)))
MemCopy(&best,&cur,sizeof(CAsmIns));
MemCopy(&best,&cur,sizeof(CAsmInst));
}
}
if (best.U8_count<255) {

13
src/Home/MakeHome.CC Executable file
View File

@ -0,0 +1,13 @@
Cd(__DIR__);;
//If these are not present in /Home, it uses the version in the root dir. You
//can make your own, modified, version of these files in your /Home directory.
#include "~/HomeLocalize"
#include "/Zenith/Boot/MakeBoot"
#include "/Zenith/Utils/MakeUtils"
#include "~/HomeWrappers"
MapFileLoad("::/Kernel/Kernel");
MapFileLoad("::/Compiler/Compiler");
#include "~/HomeKeyPlugins"
#include "~/HomeSys"
Cd("..");;

2
src/Kernel/KernelA.HH
View File

@ -1964,7 +1964,7 @@ class CAsmNum2
Bool imm_flag;
};
class CAsmIns
class CAsmInst
{
CInst *tmpins;
CAsmNum2 imm,disp;