TempleOSTS_131005.ISO

TempleOS/Kernel/KbdMouse/Keyboard.CPP

@@ -395,9 +395,9 @@ U0 KbdPktRead()
   I64 ch,sc;
   Bool set_LEDs,ctrl_alt;
 
-  if (GetTimeStamp>kbd_evt_time+time_stamp_freq>>3)
+  if (GetTSC>kbd_evt_time+time_stamp_freq>>3)
     FifoU8Flush(kbd_fifo);
-  kbd_evt_time=GetTimeStamp;
+  kbd_evt_time=GetTSC;
   raw_byte=InU8(KBD_PORT);
   sc=KbdBuildSC(raw_byte,&last_raw_byte,&last_sc,&set_LEDs,&ctrl_alt);
   if (ctrl_alt && sc) {
@@ -441,7 +441,7 @@ interrupt U0 KbdIntHandler()
     kbdmouse_rst=TRUE;
     return;
   }
-  ctrl_alt_let_ret_addr=GetBasePtr()(I64)+8;
+  ctrl_alt_let_ret_addr=GetRBP()(I64)+8;
   KbdPktRead;
 }
 

TempleOS/Kernel/KbdMouse/Message.CPP

@@ -2,7 +2,7 @@ U0 InputFilterTask()
 {
   CSrvCmd *tempc,*tempc1;
   Bool old_filter;
-  I64 old_flags=GetFlags;
+  I64 old_flags=GetRFlags;
   LBts(&Fs->task_flags,TASKf_USER);
   TaskInitExt;
   LBts(&Fs->task_flags,TASKf_INPUT_FILTER_TASK);
@@ -18,11 +18,11 @@ U0 InputFilterTask()
     else {
       if (tempc->cmd_code==SVCT_TEXT_INPUT) {
 	QueRem(tempc);
-	SetFlags(old_flags);
+	SetRFlags(old_flags);
 	if (!IsSysDeterministic)
 	  Preempt(ON);
 	try
-	  ExePutS(tempc->aux_str);
+	  ExePrint("%s",tempc->aux_str);
 	catch
 	  Fs->catch_except=TRUE;
 	Preempt(OFF);
@@ -35,7 +35,7 @@ U0 InputFilterTask()
   Fs->last_input_filter_task->next_input_filter_task=Fs->next_input_filter_task;
   if (!old_filter)
     LBtr(&Fs->last_input_filter_task->task_flags,TASKf_FILTER_INPUT);
-  SetFlags(old_flags);
+  SetRFlags(old_flags);
 }
 
 I64 ScanMsg(I64 *_p1=NULL,I64 *_p2=NULL,I64 mask=~1,CTask *task=NULL)
@@ -43,7 +43,7 @@ I64 ScanMsg(I64 *_p1=NULL,I64 *_p2=NULL,I64 mask=~1,CTask *task=NULL)
   I64 result,old_flags;
   CSrvCmd *tempc,*tempc1;
   if (!task) task=Fs;
-  old_flags=GetFlags;
+  old_flags=GetRFlags;
   tempc1=&task->srv_ctrl.next_waiting;
   while (TRUE) {
     if (task==Fs)
@@ -55,7 +55,7 @@ I64 ScanMsg(I64 *_p1=NULL,I64 *_p2=NULL,I64 mask=~1,CTask *task=NULL)
     else {
       if (tempc->cmd_code==SVCT_MSG) {
 	QueRem(tempc);
-	SetFlags(old_flags);
+	SetRFlags(old_flags);
 	result=tempc->msg_code;
 	if (_p1)
 	  *_p1=tempc->aux1;
@@ -67,7 +67,7 @@ I64 ScanMsg(I64 *_p1=NULL,I64 *_p2=NULL,I64 mask=~1,CTask *task=NULL)
 	    goto sm_done;
       }
     }
-    SetFlags(old_flags);
+    SetRFlags(old_flags);
   }
   result=MSG_NULL;
   if (_p1)
@@ -75,11 +75,11 @@ I64 ScanMsg(I64 *_p1=NULL,I64 *_p2=NULL,I64 mask=~1,CTask *task=NULL)
   if (_p2)
     *_p2=0;
   if (task->parent_task&&task->parent_task->popup_task==task) {
-    SetFlags(old_flags);
+    SetRFlags(old_flags);
     return ScanMsg(_p1,_p2,mask,task->parent_task);
   }
 sm_done:
-  SetFlags(old_flags);
+  SetRFlags(old_flags);
   return result;
 }
 
@@ -139,10 +139,10 @@ I64 GetKey(I64 *_scancode=NULL,Bool echo=FALSE,Bool raw_cursor=FALSE)
   Bool old_preempt=Preempt(OFF),cursor_on=FALSE;
   while (!ScanKey(&ch,&sc,FALSE)) {
     if (IsRaw && raw_cursor) {
-      if (!cursor_on && ToI64(GetTimeStamp*5/time_stamp_freq)&1) {
+      if (!cursor_on && ToI64(GetTSC*5/time_stamp_freq)&1) {
 	'Û';
 	cursor_on=TRUE;
-      } else if (cursor_on && !(ToI64(GetTimeStamp*5/time_stamp_freq)&1)) {
+      } else if (cursor_on && !(ToI64(GetTSC*5/time_stamp_freq)&1)) {
 	'' CH_BACKSPACE;
 	cursor_on=FALSE;
       }
@@ -157,7 +157,7 @@ I64 GetKey(I64 *_scancode=NULL,Bool echo=FALSE,Bool raw_cursor=FALSE)
       KbdMouseHandler(TRUE,FALSE);
       KbdMsgsQue;
       PopFD;
-      if (old_preempt && GetFlags&1<<RFLAGf_INT)
+      if (old_preempt && GetRFlags&1<<RFLAGf_INT)
 	Yield;
     } else {
       LBts(&Fs->task_flags,TASKf_AWAITING_MSG);

TempleOS/Kernel/KbdMouse/Mouse.CPP

@@ -1,9 +1,9 @@
 U0 MousePktRead()
 {
   U8 j;
-  if (GetTimeStamp>mouse_evt_time+time_stamp_freq>>3)
+  if (GetTSC>mouse_evt_time+time_stamp_freq>>3)
     FifoU8Flush(mouse_fifo);
-  mouse_evt_time=GetTimeStamp;
+  mouse_evt_time=GetTSC;
   FifoU8Ins(mouse_fifo,InU8(KBD_PORT));
   if (FifoU8Cnt(mouse_fifo)==mouse_pkt_size)
     while (FifoU8Rem(mouse_fifo,&j))
@@ -233,7 +233,7 @@ U0 SetMouseIP(I64 x,I64 y,I64 z,I64 l,I64 r,I64 c)
   Bool old_buttons[5];
   CSnap s;
   GetSnap(&s);
-  mouse_evt_time=GetTimeStamp;
+  mouse_evt_time=GetTSC;
   MouseUpdatePre(old_buttons);
   mxx_prescale=x/mxx_scale/s.dx;
   myy_prescale=y/myy_scale/s.dy;