inline void
call16(struct bregs *callregs)
{
- if (!MODE16 && getesp() > BUILD_STACK_ADDR)
+ if (!MODESEGMENT && getesp() > BUILD_STACK_ADDR)
panic("call16 with invalid stack\n");
asm volatile(
#if MODE16 == 1
inline void
call16big(struct bregs *callregs)
{
- ASSERT32();
+ ASSERT32FLAT();
if (getesp() > BUILD_STACK_ADDR)
panic("call16 with invalid stack\n");
asm volatile(
inline void
__call16_int(struct bregs *callregs, u16 offset)
{
- if (MODE16)
+ if (MODESEGMENT)
callregs->code.seg = GET_SEG(CS);
else
callregs->code.seg = SEG_BIOS;
call16(callregs);
}
-// 16bit trampoline for enabling irqs from 32bit mode.
-ASM16(
- " .global trampoline_checkirqs\n"
- "trampoline_checkirqs:\n"
- " rep ; nop\n"
- " lretw"
- );
-
-void
-check_irqs()
-{
- if (MODE16) {
- asm volatile(
- "sti\n"
- "nop\n"
- "rep ; nop\n"
- "cli\n"
- "cld\n"
- : : :"memory");
- } else {
- extern void trampoline_checkirqs();
- struct bregs br;
- br.flags = F_IF;
- br.code.seg = SEG_BIOS;
- br.code.offset = (u32)&trampoline_checkirqs;
- call16big(&br);
- }
-}
-
/****************************************************************
* String ops
return s;
}
+void memset_fl(void *ptr, u8 val, size_t size)
+{
+ if (MODESEGMENT)
+ memset_far(FLATPTR_TO_SEG(ptr), (void*)(FLATPTR_TO_OFFSET(ptr)),
+ val, size);
+ else
+ memset(ptr, val, size);
+}
+
inline void
memcpy_far(u16 d_seg, void *d_far, u16 s_seg, const void *s_far, size_t len)
{
: "cc", "memory");
}
+inline void
+memcpy_fl(void *d_fl, const void *s_fl, size_t len)
+{
+ if (MODESEGMENT)
+ memcpy_far(FLATPTR_TO_SEG(d_fl), (void*)FLATPTR_TO_OFFSET(d_fl)
+ , FLATPTR_TO_SEG(s_fl), (void*)FLATPTR_TO_OFFSET(s_fl)
+ , len);
+ else
+ memcpy(d_fl, s_fl, len);
+}
+
void *
#undef memcpy
memcpy(void *d1, const void *s1, size_t len)
-#if MODE16 == 0
+#if MODESEGMENT == 0
#define memcpy __builtin_memcpy
#endif
{
return d1;
}
-// Copy from memory mapped IO. IO mem is very slow, so yield
-// periodically. 'len' must be 4 byte aligned.
+// Copy to/from memory mapped IO. IO mem is very slow, so yield
+// periodically.
void
iomemcpy(void *d, const void *s, u32 len)
{
yield();
- while (len) {
+ while (len > 3) {
u32 copylen = len;
if (copylen > 2048)
copylen = 2048;
- len -= copylen;
copylen /= 4;
+ len -= copylen * 4;
asm volatile(
"rep movsl (%%esi),%%es:(%%edi)"
: "+c"(copylen), "+S"(s), "+D"(d)
: : "cc", "memory");
yield();
}
+ if (len)
+ // Copy any remaining bytes.
+ memcpy(d, s, len);
}
void *
strtcpy(char *dest, const char *src, size_t len)
{
char *d = dest;
- while (len-- && *src != '\0')
+ while (--len && *src != '\0')
*d++ = *src++;
*d = '\0';
return dest;
}
+// locate first occurance of character c in the string s
+char *
+strchr(const char *s, int c)
+{
+ for (; *s; s++)
+ if (*s == c)
+ return (char*)s;
+ return NULL;
+}
-/****************************************************************
- * Keyboard calls
- ****************************************************************/
-
-// Wait for 'usec' microseconds using (with irqs enabled) using int 1586.
+// Remove any trailing blank characters (spaces, new lines, carriage returns)
void
-biosusleep(u32 usec)
+nullTrailingSpace(char *buf)
{
- struct bregs br;
- memset(&br, 0, sizeof(br));
- br.flags = F_IF;
- br.ah = 0x86;
- br.cx = usec >> 16;
- br.dx = usec;
- call16_int(0x15, &br);
+ int len = strlen(buf);
+ char *end = &buf[len-1];
+ while (end >= buf && *end <= ' ')
+ *(end--) = '\0';
}
+/****************************************************************
+ * Keyboard calls
+ ****************************************************************/
+
// See if a keystroke is pending in the keyboard buffer.
static int
-check_for_keystroke()
+check_for_keystroke(void)
{
struct bregs br;
memset(&br, 0, sizeof(br));
// Return a keystroke - waiting forever if necessary.
static int
-get_raw_keystroke()
+get_raw_keystroke(void)
{
struct bregs br;
memset(&br, 0, sizeof(br));
int
get_keystroke(int msec)
{
+ u32 end = calc_future_timer(msec);
for (;;) {
if (check_for_keystroke())
return get_raw_keystroke();
- if (msec <= 0)
+ if (check_timer(end))
return -1;
- biosusleep(50*1000);
- msec -= 50;
+ wait_irq();
}
}