Skip to content

Commit 1239389

Browse files
committed
intuition: implement EasyRequestArgs
SFS uses intuition.library EasyRequestArgs() during startup when it\nneeds to surface a request. The rebased tree still had the helper\nwith an old single-argument signature, so the stub generator\ntreated it as missing and returned d0=0.\n\nMatch the fd signature and return success from the compatibility\nstub so startup can continue.
1 parent 3606589 commit 1239389

2 files changed

Lines changed: 18 additions & 1 deletion

File tree

amitools/vamos/lib/IntuitionLibrary.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ def AutoRequest(self, ctx, text):
1616
msg = ctx.mem.r_cstr(itext)
1717
log_intuition.error("-----> AutoRequest '%s'", msg)
1818

19-
def EasyRequestArgs(self, ctx, easy_struct):
19+
def EasyRequestArgs(self, ctx, window, easy_struct, idcmp_ptr, args):
2020
es_TextFormat = ctx.mem.r32(easy_struct + 12) # EasyStruct.es_TextFormat
2121
msg = ctx.mem.r_cstr(es_TextFormat)
2222
log_intuition.error("-----> EasyRequest '%s'", msg)
23+
return 1
2324

2425
def CurrentTime(self, ctx, secs_ptr, micros_ptr):
2526
secs, micros = TimerDevice.get_sys_time()

test/pytask/pytask_intuition.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,19 @@ def intuition_func(ctx, intuition_lib):
4747
task = gen_intuition_task(intuition_func)
4848
exit_codes = vamos_task.run([task])
4949
assert exit_codes == [0]
50+
51+
52+
def pytask_intuition_easy_request_args_test(vamos_task):
53+
def intuition_func(ctx, intuition_lib):
54+
text = ctx.alloc.alloc_cstr("sfs startup")
55+
easy = ctx.alloc.alloc_memory(16)
56+
ctx.mem.w32(easy.addr + 12, text.addr)
57+
58+
assert intuition_lib.EasyRequestArgs(0, easy.addr, 0, 0) == 1
59+
60+
ctx.alloc.free_memory(easy)
61+
ctx.alloc.free_cstr(text)
62+
63+
task = gen_intuition_task(intuition_func)
64+
exit_codes = vamos_task.run([task])
65+
assert exit_codes == [0]

0 commit comments

Comments
 (0)